[OE-core] [PATCH 2/3] initscripts: Make umountfs a bit more robust, bump PR
Paul Eggleton
paul.eggleton at linux.intel.com
Fri Mar 18 17:21:41 UTC 2011
From: Tom Rini <tom_rini at mentor.com>
Avoids error messages on shutdown.
Imported from OE commit 072cad0100fd828e7fee8f3fa3ade23e4306b394
Signed-off-by: Paul Eggleton <paul.eggleton at 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
More information about the Openembedded-core
mailing list