[PATCH 0/3] Fix errors in startup/shutdown

[PATCH 0/3] Fix errors in startup/shutdown

[Paul Eggleton]

From: Paul Eggleton <paul.eggleton@linux.intel.com>

Fixes a number of minor errors in startup/shutdown. Includes one fix imported
from OE.

Pull URL: git://git.openembedded.org/openembedded-core-contrib
  Branch: paule/init-error-fixes
  Browse: http://git.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=paule/init-error-fixes

Thanks,
    Paul Eggleton <paul.eggleton@linux.intel.com>
---


Paul Eggleton (2):
  nfs-utils: fix "sh: bad number" error on start/stop of nfsserver
  busybox: enable unmount all feature

Tom Rini (1):
  initscripts: Make umountfs a bit more robust, bump PR

 .../nfs-utils/nfs-utils/nfsserver                  |    2 +-
 meta/recipes-core/busybox/busybox-1.17.3/defconfig |    2 +-
 meta/recipes-core/busybox/busybox_1.17.3.bb        |    2 +-
 .../initscripts/initscripts-1.0/umountfs           |    6 +++---
 meta/recipes-core/initscripts/initscripts_1.0.bb   |    2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)

[PATCH 1/3] nfs-utils: fix "sh: bad number" error on start/stop of nfsserver

[Paul Eggleton]

From: Paul Eggleton <paul.eggleton@linux.intel.com>

Adds a test to avoid the "sh: bad number" error message during service
start or stop of nfsserver when there is no NFS_SERVERS value set in
/etc/default/nfsd.

Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
---
 .../nfs-utils/nfs-utils/nfsserver                  |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/meta/recipes-connectivity/nfs-utils/nfs-utils/nfsserver b/meta/recipes-connectivity/nfs-utils/nfs-utils/nfsserver
index fe76c51..69c8718 100644
--- a/meta/recipes-connectivity/nfs-utils/nfs-utils/nfsserver
+++ b/meta/recipes-connectivity/nfs-utils/nfs-utils/nfsserver
@@ -31,7 +31,7 @@ test -x "$NFS_NFSD" || exit 0
 #
 # Default is 8 threads, value is settable between 1 and the truely
 # ridiculous 99
-test "$NFS_SERVERS" -gt 0 && test "$NFS_SERVERS" -lt 100 || NFS_SERVERS=8
+test "$NFS_SERVERS" != "" && test "$NFS_SERVERS" -gt 0 && test "$NFS_SERVERS" -lt 100 || NFS_SERVERS=8
 #
 # The default state directory is /var/lib/nfs
 test -n "$NFS_STATEDIR" || NFS_STATEDIR=/var/lib/nfs
-- 
1.7.1

[PATCH 2/3] initscripts: Make umountfs a bit more robust, bump PR

[Paul Eggleton]

From: Tom Rini <tom_rini@mentor.com>

Avoids error messages on shutdown.

Imported from OE commit 072cad0100fd828e7fee8f3fa3ade23e4306b394

Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
---
 .../initscripts/initscripts-1.0/umountfs           |    6 +++---
 meta/recipes-core/initscripts/initscripts_1.0.bb   |    2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/meta/recipes-core/initscripts/initscripts-1.0/umountfs b/meta/recipes-core/initscripts/initscripts-1.0/umountfs
index 5c6793d..6ad0e43 100755
--- a/meta/recipes-core/initscripts/initscripts-1.0/umountfs
+++ b/meta/recipes-core/initscripts/initscripts-1.0/umountfs
@@ -16,9 +16,9 @@ swapoff -a
 
 # We leave /proc mounted.
 echo "Unmounting local filesystems..."
-mount -o remount,ro /mnt/ram
-umount -f -a -r
-
+grep -q /mnt/ram /proc/mounts && mount -o remount,ro /mnt/ram
 mount -o remount,ro /
 
+umount -f -a -r > /dev/null 2>&1
+
 : exit 0
diff --git a/meta/recipes-core/initscripts/initscripts_1.0.bb b/meta/recipes-core/initscripts/initscripts_1.0.bb
index 1d2509e..d990925 100644
--- a/meta/recipes-core/initscripts/initscripts_1.0.bb
+++ b/meta/recipes-core/initscripts/initscripts_1.0.bb
@@ -6,7 +6,7 @@ DEPENDS = "makedevs"
 RDEPENDS_${PN} = "makedevs"
 LICENSE = "GPLv2"
 LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe"
-PR = "r123"
+PR = "r124"
 
 SRC_URI = "file://functions \
            file://halt \
-- 
1.7.1

[PATCH 3/3] busybox: enable unmount all feature

[Paul Eggleton]

From: Paul Eggleton <paul.eggleton@linux.intel.com>

This allows "umount -f -a -r" in our initscripts to actually do something.

Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
---
 meta/recipes-core/busybox/busybox-1.17.3/defconfig |    2 +-
 meta/recipes-core/busybox/busybox_1.17.3.bb        |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/meta/recipes-core/busybox/busybox-1.17.3/defconfig b/meta/recipes-core/busybox/busybox-1.17.3/defconfig
index 87e6244..5327a64 100644
--- a/meta/recipes-core/busybox/busybox-1.17.3/defconfig
+++ b/meta/recipes-core/busybox/busybox-1.17.3/defconfig
@@ -567,7 +567,7 @@ CONFIG_SWAPONOFF=y
 # CONFIG_FEATURE_SWAPON_PRI is not set
 CONFIG_SWITCH_ROOT=y
 CONFIG_UMOUNT=y
-# CONFIG_FEATURE_UMOUNT_ALL is not set
+CONFIG_FEATURE_UMOUNT_ALL=y
 
 #
 # Common options for mount/umount
diff --git a/meta/recipes-core/busybox/busybox_1.17.3.bb b/meta/recipes-core/busybox/busybox_1.17.3.bb
index c5fbe9c..28342fe 100644
--- a/meta/recipes-core/busybox/busybox_1.17.3.bb
+++ b/meta/recipes-core/busybox/busybox_1.17.3.bb
@@ -1,5 +1,5 @@
 require busybox.inc
-PR = "r1"
+PR = "r2"
 
 SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.bz2;name=tarball \
            file://udhcpscript.patch \
-- 
1.7.1