[oe-commits] org.oe.dev initscripts: don't run the devices (devfs) script when udev is active, update for new udev versions

[pH5 commit]

initscripts: don't run the devices (devfs) script when udev is active, update for new udev versions

Author: pH5 at openembedded.org
Branch: org.openembedded.dev
Revision: 6651fb704192756bf7c80d213d5cb1e48a1541dd
ViewMTN: http://monotone.openembedded.org/revision.psp?id=6651fb704192756bf7c80d213d5cb1e48a1541dd
Files:
1
packages/initscripts/initscripts-1.0/checkroot.sh
packages/initscripts/initscripts-1.0/devices
packages/initscripts/initscripts_1.0.bb
Diffs:

#
# mt diff -r1b280b9a2285cf155d8394bfe310ff3cd46bd516 -r6651fb704192756bf7c80d213d5cb1e48a1541dd
#
# 
# 
# patch "packages/initscripts/initscripts-1.0/checkroot.sh"
#  from [3763a7e7acf6f242858d157dce551551f3666007]
#    to [9fcbc869545c753200dfa0f15501f0fb1f7730aa]
# 
# patch "packages/initscripts/initscripts-1.0/devices"
#  from [8e8d88a2006570972dfcf52f495ca0d9e1c0c729]
#    to [640264fa607b9a1d128ce7a19e6883782a1746fb]
# 
# patch "packages/initscripts/initscripts_1.0.bb"
#  from [39fa26bb467a8b31a913cbb23f5e6b4bb89a65bd]
#    to [f70c223a374abeae96153119e21d584d4e21636b]
# 
============================================================
--- packages/initscripts/initscripts-1.0/checkroot.sh	3763a7e7acf6f242858d157dce551551f3666007
+++ packages/initscripts/initscripts-1.0/checkroot.sh	9fcbc869545c753200dfa0f15501f0fb1f7730aa
@@ -148,7 +148,12 @@ fi
 #	remount the rootfs rw but do not try to change mtab because it
 #	is on a ro fs until the remount succeeded. Then clean up old mtabs
 #	and finally write the new mtab.
+#	This part is only needed if the rootfs was mounted ro.
 #
+if [ $(grep rootfs /proc/mounts | awk '{print $4}') = rw ]; then
+	exit 0
+fi
+echo "Remounting root file system..."
 mount -n -o remount,$rootmode /
 if test "$rootmode" = rw
 then
============================================================
--- packages/initscripts/initscripts-1.0/devices	8e8d88a2006570972dfcf52f495ca0d9e1c0c729
+++ packages/initscripts/initscripts-1.0/devices	640264fa607b9a1d128ce7a19e6883782a1746fb
@@ -6,7 +6,7 @@
 . /etc/default/rcS
 
 # exit without doing anything if udev is active
-if test -e /dev/.udevdb; then
+if test -e /dev/.udev -o -e /dev/.udevdb; then
 	exit 0
 fi
 
============================================================
--- packages/initscripts/initscripts_1.0.bb	39fa26bb467a8b31a913cbb23f5e6b4bb89a65bd
+++ packages/initscripts/initscripts_1.0.bb	f70c223a374abeae96153119e21d584d4e21636b
@@ -6,7 +6,7 @@ LICENSE = "GPL"
 DEPENDS_openzaurus = "makedevs virtual/kernel"
 RDEPENDS = "makedevs"
 LICENSE = "GPL"
-PR = "r74"
+PR = "r75"
 
 SRC_URI = "file://halt \
            file://ramdisk \