From: Tom Rini <tom_rini@mentor.com>
Date: Tue, 23 Feb 2010 18:56:46 +0000 (-0700)
Subject: initscripts: Make umountfs a bit more robust, bump PR
X-Git-Tag: Release-2010-05/1~491^2~110
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=072cad0100fd828e7fee8f3fa3ade23e4306b394;p=openembedded.git

initscripts: Make umountfs a bit more robust, bump PR
---

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 \