From: Tom Rini <tom_rini@mentor.com>
Date: Thu, 18 Feb 2010 17:41:08 +0000 (-0700)
Subject: initscripts: Have sysfs.sh do similar checks to rcS and bump PR.
X-Git-Tag: Release-2010-05/1~491^2~181
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=14bb71705b1c25d44d4fb6a2cd0d6a1ef20791fc;p=openembedded.git

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
---

diff --git a/recipes/initscripts/initscripts-1.0/sysfs.sh b/recipes/initscripts/initscripts-1.0/sysfs.sh
index 4486128ad5..b2426147a7 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 664214436e..1bd6706abe 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 \