From fdb3d74458cd36a0fe53ee097394acc37d658ce9 Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Fri, 30 Dec 2011 15:58:47 +0000 Subject: initscripts: avoid mounting /sys if it is already mounted Signed-off-by: Otavio Salvador --- meta/recipes-core/initscripts/initscripts-1.0/sysfs.sh | 4 ++-- meta/recipes-core/initscripts/initscripts_1.0.bb | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'meta/recipes-core/initscripts') diff --git a/meta/recipes-core/initscripts/initscripts-1.0/sysfs.sh b/meta/recipes-core/initscripts/initscripts-1.0/sysfs.sh index be28bb35bf..bd87dcddd2 100644 --- a/meta/recipes-core/initscripts/initscripts-1.0/sysfs.sh +++ b/meta/recipes-core/initscripts/initscripts-1.0/sysfs.sh @@ -14,6 +14,6 @@ if [ -e /proc ] && ! [ -e /proc/mounts ]; then mount -t proc proc /proc fi -if [ -e /sys ] && grep -q sysfs /proc/filesystems; then - mount sysfs /sys -t sysfs +if [ -e /sys ] && grep -q sysfs /proc/filesystems && ! [ -e /sys/class ]; then + mount -t sysfs sysfs /sys fi diff --git a/meta/recipes-core/initscripts/initscripts_1.0.bb b/meta/recipes-core/initscripts/initscripts_1.0.bb index ffca817cea..98f5e9bf65 100644 --- a/meta/recipes-core/initscripts/initscripts_1.0.bb +++ b/meta/recipes-core/initscripts/initscripts_1.0.bb @@ -3,7 +3,7 @@ DESCRIPTION = "Initscripts provide the basic system startup initialization scrip SECTION = "base" LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" -PR = "r127" +PR = "r128" INHIBIT_DEFAULT_DEPS = "1" -- cgit 1.2.3-korg