diff options
| author | Tom Rini <tom_rini@mentor.com> | 2011-03-16 12:02:35 +0000 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-03-18 23:23:31 +0000 |
| commit | debcc6c34767d41433c8ded80511312a2901e59a (patch) | |
| tree | 1439905a5dfd1ba2d8760aa87d843975ae3529c7 /meta/recipes-core/initscripts | |
| parent | 07f7dc47ecf87c186062181447edaa268a092801 (diff) | |
| download | ast2050-yocto-poky-debcc6c34767d41433c8ded80511312a2901e59a.zip ast2050-yocto-poky-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/recipes-core/initscripts')
| -rwxr-xr-x | meta/recipes-core/initscripts/initscripts-1.0/umountfs | 6 | ||||
| -rw-r--r-- | 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 \ |
