aboutsummaryrefslogtreecommitdiffstats
path: root/meta/recipes-core/initscripts
diff options
context:
space:
mode:
authorTom Rini <tom_rini@mentor.com>2011-03-16 12:02:35 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-03-18 23:16:56 +0000
commit5188687660f5aa37014aac50c43e141f032455d7 (patch)
tree7f0be2cc0a6c31ccb76e427945ad2143eb7f3b91 /meta/recipes-core/initscripts
parent0f2debd9360abac54d3e44551af309f0bdde96e7 (diff)
downloadopenembedded-core-contrib-5188687660f5aa37014aac50c43e141f032455d7.tar.gz
openembedded-core-contrib-5188687660f5aa37014aac50c43e141f032455d7.tar.bz2
openembedded-core-contrib-5188687660f5aa37014aac50c43e141f032455d7.zip
initscripts: Make umountfs a bit more robust, bump PR
Avoids error messages on shutdown. Imported from OE commit 072cad0100fd828e7fee8f3fa3ade23e4306b394 Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Diffstat (limited to 'meta/recipes-core/initscripts')
-rwxr-xr-xmeta/recipes-core/initscripts/initscripts-1.0/umountfs6
-rw-r--r--meta/recipes-core/initscripts/initscripts_1.0.bb2
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 5c6793dc9cf..6ad0e431198 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 1d2509e68b7..d99092584e8 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 \