From fc1fc594335687583fc2ac675d3da919dd484f2a Mon Sep 17 00:00:00 2001
From: hschang <chang@dev3>
Date: Thu, 7 May 2015 13:32:17 +0900
Subject: [PATCH] [autofs] fix options.

---
 meta-openvuplus/recipes-daemon/autofs/autofs/auto.hotplug     |  1 +
 meta-openvuplus/recipes-daemon/autofs/autofs/auto.master      |  2 ++
 meta-openvuplus/recipes-daemon/autofs/autofs/autofs.default   |  2 +-
 .../recipes-daemon/autofs/autofs/volatiles.99_autofs          |  3 ++-
 meta-openvuplus/recipes-daemon/autofs/autofs_5.1.0.bbappend   | 11 ++++++++---
 .../recipes-vuplus/packagegroups/packagegroup-vuplus-base.bb  |  3 ++-
 6 files changed, 16 insertions(+), 6 deletions(-)
 create mode 100644 meta-openvuplus/recipes-daemon/autofs/autofs/auto.hotplug
 create mode 100644 meta-openvuplus/recipes-daemon/autofs/autofs/auto.master

diff --git a/meta-openvuplus/recipes-daemon/autofs/autofs/auto.hotplug b/meta-openvuplus/recipes-daemon/autofs/autofs/auto.hotplug
new file mode 100644
index 0000000..67cf4c5
--- /dev/null
+++ b/meta-openvuplus/recipes-daemon/autofs/autofs/auto.hotplug
@@ -0,0 +1 @@
+* -fstype=auto,rw,sync :/dev/&
diff --git a/meta-openvuplus/recipes-daemon/autofs/autofs/auto.master b/meta-openvuplus/recipes-daemon/autofs/autofs/auto.master
new file mode 100644
index 0000000..140a93b
--- /dev/null
+++ b/meta-openvuplus/recipes-daemon/autofs/autofs/auto.master
@@ -0,0 +1,2 @@
+/autofs     /etc/auto.hotplug --ghost
+/media/net  /etc/auto.network --ghost
diff --git a/meta-openvuplus/recipes-daemon/autofs/autofs/autofs.default b/meta-openvuplus/recipes-daemon/autofs/autofs/autofs.default
index 36ef995..7006ea9 100644
--- a/meta-openvuplus/recipes-daemon/autofs/autofs/autofs.default
+++ b/meta-openvuplus/recipes-daemon/autofs/autofs/autofs.default
@@ -128,7 +128,7 @@ BROWSE_MODE="no"
 # If the kernel supports using the autofs miscellanous device
 # and you wish to use it you must set this configuration option
 # to "yes" otherwise it will not be used.
-USE_MISC_DEVICE="yes"
+#USE_MISC_DEVICE="yes"
 #
 #OPTIONS=""
 #
diff --git a/meta-openvuplus/recipes-daemon/autofs/autofs/volatiles.99_autofs b/meta-openvuplus/recipes-daemon/autofs/autofs/volatiles.99_autofs
index 7c0b703..85a4c1b 100644
--- a/meta-openvuplus/recipes-daemon/autofs/autofs/volatiles.99_autofs
+++ b/meta-openvuplus/recipes-daemon/autofs/autofs/volatiles.99_autofs
@@ -1,3 +1,4 @@
 # <type> <owner> <group> <mode> <path> <linksource>
 d root root 0700 /var/run/autofs none
-d root root 0755 /media/autofs none
+d root root 0755 /media/net none
+d root root 0755 /autofs none
diff --git a/meta-openvuplus/recipes-daemon/autofs/autofs_5.1.0.bbappend b/meta-openvuplus/recipes-daemon/autofs/autofs_5.1.0.bbappend
index e3b5c69..0b43369 100644
--- a/meta-openvuplus/recipes-daemon/autofs/autofs_5.1.0.bbappend
+++ b/meta-openvuplus/recipes-daemon/autofs/autofs_5.1.0.bbappend
@@ -1,7 +1,9 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+PR .= "-vuplus0"
 
 SRC_URI += " \
 	file://volatiles.99_autofs \
+	file://auto.master \
+	file://auto.hotplug \
 	file://auto.network \
 	file://autofs.default \
 "
@@ -9,13 +11,16 @@ SRC_URI += " \
 EXTRA_OECONF += "--with-confdir=/etc/default --with-mapdir=/etc"
 
 do_install_append() {
-    echo "/media/autofs  /etc/auto.network  --ghost" > ${D}/etc/auto.master
     sed -i 's/count -lt 15/count -lt 60/' ${D}/etc/init.d/autofs
     sed -i 's/sleep 20/sleep 1/' ${D}/etc/init.d/autofs
     install -d ${D}${sysconfdir}/default/volatiles
     install -m 644 ${WORKDIR}/volatiles.99_autofs ${D}${sysconfdir}/default/volatiles/99_autofs
+    install -m 644 ${WORKDIR}/auto.master ${D}/etc/auto.master
+    install -m 644 ${WORKDIR}/auto.hotplug ${D}/etc/auto.hotplug
     install -m 644 ${WORKDIR}/auto.network ${D}/etc/auto.network
     install -m 644 ${WORKDIR}/autofs.default ${D}/etc/default/autofs
 }
 
-CONFFILES_${PN} = "/etc/auto.network"
+CONFFILES_${PN} = "/etc/auto.network /etc/auto.hotplug"
+
+FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
diff --git a/meta-openvuplus/recipes-vuplus/packagegroups/packagegroup-vuplus-base.bb b/meta-openvuplus/recipes-vuplus/packagegroups/packagegroup-vuplus-base.bb
index a505911..45c4cfa 100644
--- a/meta-openvuplus/recipes-vuplus/packagegroups/packagegroup-vuplus-base.bb
+++ b/meta-openvuplus/recipes-vuplus/packagegroups/packagegroup-vuplus-base.bb
@@ -2,12 +2,13 @@ SUMMARY = "Vuplus: Base set of packages for Vuplus."
 SECTION = "vuplus/base"
 LICENSE = "GPLv2"
 LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6"
-PR = "r2"
+PR = "r3"
 
 inherit packagegroup
 
 VUPLUS_BASE_ESSENTIAL = "\
     autofs \
+    procps \
     vuplus-compat \
     e2fsprogs-e2fsck \
     e2fsprogs-mke2fs \
-- 
2.7.4