aboutsummaryrefslogtreecommitdiffstats
path: root/meta/recipes-core/initscripts
diff options
context:
space:
mode:
authorOtavio Salvador <otavio@ossystems.com.br>2011-12-30 15:58:47 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-01-06 11:27:27 +0000
commitfdb3d74458cd36a0fe53ee097394acc37d658ce9 (patch)
tree59b1635567998ce8373673469e1ccc581d3924c3 /meta/recipes-core/initscripts
parent73fc8f706b08ec74087754eacd2257856fe829d1 (diff)
downloadopenembedded-core-contrib-fdb3d74458cd36a0fe53ee097394acc37d658ce9.tar.gz
openembedded-core-contrib-fdb3d74458cd36a0fe53ee097394acc37d658ce9.tar.bz2
openembedded-core-contrib-fdb3d74458cd36a0fe53ee097394acc37d658ce9.zip
initscripts: avoid mounting /sys if it is already mounted
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
Diffstat (limited to 'meta/recipes-core/initscripts')
-rw-r--r--meta/recipes-core/initscripts/initscripts-1.0/sysfs.sh4
-rw-r--r--meta/recipes-core/initscripts/initscripts_1.0.bb2
2 files changed, 3 insertions, 3 deletions
diff --git a/meta/recipes-core/initscripts/initscripts-1.0/sysfs.sh b/meta/recipes-core/initscripts/initscripts-1.0/sysfs.sh
index be28bb35bfd..bd87dcddd24 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 ffca817cea3..98f5e9bf654 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"