summaryrefslogtreecommitdiffstats
path: root/meta
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:23:31 +0000
commitdebcc6c34767d41433c8ded80511312a2901e59a (patch)
tree1439905a5dfd1ba2d8760aa87d843975ae3529c7 /meta
parent07f7dc47ecf87c186062181447edaa268a092801 (diff)
downloadpoky-debcc6c34767d41433c8ded80511312a2901e59a.tar.gz
initscripts: Make umountfs a bit more robust, bump PR
Avoids error messages on shutdown. Imported from OE commit 072cad0100fd828e7fee8f3fa3ade23e4306b394 (From OE-Core rev: 5188687660f5aa37014aac50c43e141f032455d7) Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-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 5c6793dc9c..6ad0e43119 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
16 16
17# We leave /proc mounted. 17# We leave /proc mounted.
18echo "Unmounting local filesystems..." 18echo "Unmounting local filesystems..."
19mount -o remount,ro /mnt/ram 19grep -q /mnt/ram /proc/mounts && mount -o remount,ro /mnt/ram
20umount -f -a -r
21
22mount -o remount,ro / 20mount -o remount,ro /
23 21
22umount -f -a -r > /dev/null 2>&1
23
24: exit 0 24: exit 0
diff --git a/meta/recipes-core/initscripts/initscripts_1.0.bb b/meta/recipes-core/initscripts/initscripts_1.0.bb
index 1d2509e68b..d99092584e 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"
6RDEPENDS_${PN} = "makedevs" 6RDEPENDS_${PN} = "makedevs"
7LICENSE = "GPLv2" 7LICENSE = "GPLv2"
8LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" 8LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe"
9PR = "r123" 9PR = "r124"
10 10
11SRC_URI = "file://functions \ 11SRC_URI = "file://functions \
12 file://halt \ 12 file://halt \