aboutsummaryrefslogtreecommitdiffstats
path: root/recipes/initscripts
diff options
context:
space:
mode:
authorTom Rini <tom_rini@mentor.com>2010-02-23 11:56:46 -0700
committerTom Rini <tom_rini@mentor.com>2010-02-23 11:56:46 -0700
commit072cad0100fd828e7fee8f3fa3ade23e4306b394 (patch)
tree7e2934dde0e42db529ab9de44443d48915ef4e36 /recipes/initscripts
parent86d55b2f5adcd7a586ea606786faf8d20f0dfe36 (diff)
downloadopenembedded-072cad0100fd828e7fee8f3fa3ade23e4306b394.tar.gz
initscripts: Make umountfs a bit more robust, bump PR
Diffstat (limited to 'recipes/initscripts')
-rw-r--r--recipes/initscripts/files/umountfs6
-rw-r--r--recipes/initscripts/initscripts_1.0.bb2
2 files changed, 4 insertions, 4 deletions
diff --git a/recipes/initscripts/files/umountfs b/recipes/initscripts/files/umountfs
index ec75b0c4a4..79bb48f74e 100644
--- a/recipes/initscripts/files/umountfs
+++ b/recipes/initscripts/files/umountfs
@@ -10,9 +10,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/recipes/initscripts/initscripts_1.0.bb b/recipes/initscripts/initscripts_1.0.bb
index 1bd6706abe..2c0689ffc8 100644
--- a/recipes/initscripts/initscripts_1.0.bb
+++ b/recipes/initscripts/initscripts_1.0.bb
@@ -4,7 +4,7 @@ PRIORITY = "required"
DEPENDS = "makedevs"
RDEPENDS = "makedevs"
LICENSE = "GPL"
-PR = "r116"
+PR = "r117"
SRC_URI = "file://functions \
file://halt \