From 5a7bb23659fa97a1ac55bf6769605cf342a62911 Mon Sep 17 00:00:00 2001
From: Philipp Zabel <philipp.zabel@gmail.com>
Date: Fri, 25 Aug 2006 10:09:02 +0000
Subject: initscripts: don't run the devices (devfs) script when udev is
 active, update for new udev versions

---
 packages/initscripts/initscripts-1.0/checkroot.sh | 5 +++++
 packages/initscripts/initscripts-1.0/devices      | 2 +-
 packages/initscripts/initscripts_1.0.bb           | 2 +-
 3 files changed, 7 insertions(+), 2 deletions(-)

(limited to 'packages/initscripts')

diff --git a/packages/initscripts/initscripts-1.0/checkroot.sh b/packages/initscripts/initscripts-1.0/checkroot.sh
index 8255038c32..0283e1acca 100755
--- a/packages/initscripts/initscripts-1.0/checkroot.sh
+++ b/packages/initscripts/initscripts-1.0/checkroot.sh
@@ -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
diff --git a/packages/initscripts/initscripts-1.0/devices b/packages/initscripts/initscripts-1.0/devices
index 28fb71fe3f..fb0f851d16 100755
--- a/packages/initscripts/initscripts-1.0/devices
+++ b/packages/initscripts/initscripts-1.0/devices
@@ -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
 
diff --git a/packages/initscripts/initscripts_1.0.bb b/packages/initscripts/initscripts_1.0.bb
index 0d14403a36..29747d41c2 100644
--- a/packages/initscripts/initscripts_1.0.bb
+++ b/packages/initscripts/initscripts_1.0.bb
@@ -6,7 +6,7 @@ DEPENDS = "makedevs"
 DEPENDS_openzaurus = "makedevs virtual/kernel"
 RDEPENDS = "makedevs"
 LICENSE = "GPL"
-PR = "r74"
+PR = "r75"
 
 SRC_URI = "file://halt \
            file://ramdisk \
-- 
cgit v1.2.3


From 31489e5e5023c60be052aa263c53d33ddfcb6742 Mon Sep 17 00:00:00 2001
From: Mustafa Yuecel <yuecelm@ee.ethz.ch>
Date: Fri, 25 Aug 2006 16:13:33 +0000
Subject: initscripts-1.0/slugos/devices.patch: adapt patch to the current
 devices file

---
 packages/initscripts/initscripts-1.0/slugos/devices.patch | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'packages/initscripts')

diff --git a/packages/initscripts/initscripts-1.0/slugos/devices.patch b/packages/initscripts/initscripts-1.0/slugos/devices.patch
index 26b1841d5b..2583b62f48 100644
--- a/packages/initscripts/initscripts-1.0/slugos/devices.patch
+++ b/packages/initscripts/initscripts-1.0/slugos/devices.patch
@@ -8,8 +8,8 @@
  . /etc/default/rcS
  
  # exit without doing anything if udev is active
--if test -e /dev/.udevdb; then
-+if test -e /dev/.udevdb -o -e /dev/.permanent; then
+-if test -e /dev/.udev -o -e /dev/.udevdb; then
++if test -e /dev/.udev -o -e /dev/.udevdb -o -e /dev/.permanent; then
  	exit 0
  fi
  
-- 
cgit v1.2.3