[oe-commits] Tom Rini : initscripts: Have sysfs.sh do similar checks to rcS and bump PR.

git version control git at git.openembedded.org
Fri Feb 19 00:05:17 UTC 2010


Module: openembedded.git
Branch: shr/unstable
Commit: 14bb71705b1c25d44d4fb6a2cd0d6a1ef20791fc
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=14bb71705b1c25d44d4fb6a2cd0d6a1ef20791fc

Author: Tom Rini <tom_rini at mentor.com>
Date:   Thu Feb 18 10:41:08 2010 -0700

initscripts: Have sysfs.sh do similar checks to rcS and bump PR.

rcS checks for [ -e /sys/kernel ], sysfs.sh, for proc will check
-e /proc && ! -e /proc/mounts, so for sysfs check for
-e /sys && ! -e /sys/kernel && sysfs in /proc/filesystems

---

 recipes/initscripts/initscripts-1.0/sysfs.sh |    2 +-
 recipes/initscripts/initscripts_1.0.bb       |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/recipes/initscripts/initscripts-1.0/sysfs.sh b/recipes/initscripts/initscripts-1.0/sysfs.sh
index 4486128..b242614 100644
--- a/recipes/initscripts/initscripts-1.0/sysfs.sh
+++ b/recipes/initscripts/initscripts-1.0/sysfs.sh
@@ -4,7 +4,7 @@ if [ -e /proc ] && ! [ -e /proc/mounts ]; then
   mount -t proc proc /proc
 fi
 
-if [ -e /sys ] && grep -q sysfs /proc/filesystems; then
+if [ -e /sys ] && ! [ -e /sys/kernel ] && grep -q sysfs /proc/filesystems; then
   mount sysfs /sys -t sysfs
 fi
 
diff --git a/recipes/initscripts/initscripts_1.0.bb b/recipes/initscripts/initscripts_1.0.bb
index 6642144..1bd6706 100644
--- a/recipes/initscripts/initscripts_1.0.bb
+++ b/recipes/initscripts/initscripts_1.0.bb
@@ -4,7 +4,7 @@ PRIORITY = "required"
 DEPENDS = "makedevs"
 RDEPENDS = "makedevs"
 LICENSE = "GPL"
-PR = "r115"
+PR = "r116"
 
 SRC_URI = "file://functions \
            file://halt \





More information about the Openembedded-commits mailing list