From 5188687660f5aa37014aac50c43e141f032455d7 Mon Sep 17 00:00:00 2001 From: Tom Rini Date: Wed, 16 Mar 2011 12:02:35 +0000 Subject: initscripts: Make umountfs a bit more robust, bump PR Avoids error messages on shutdown. Imported from OE commit 072cad0100fd828e7fee8f3fa3ade23e4306b394 Signed-off-by: Paul Eggleton --- meta/recipes-core/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 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 # 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 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" RDEPENDS_${PN} = "makedevs" LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" -PR = "r123" +PR = "r124" SRC_URI = "file://functions \ file://halt \ -- cgit 1.2.3-korg