From ab07e56981ce6048ee006ac1c7bfb6b767079fb6 Mon Sep 17 00:00:00 2001
From: Chris Larson <clarson@kergoth.com>
Date: Wed, 13 Oct 2004 20:32:07 +0000
Subject: Merge openembedded@openembedded.bkbits.net:packages into
 handhelds.org:/home/kergoth/code/packages

2004/10/13 20:37:34+01:00 (none)!pb
reorder initscripts to make devices and udev play better together

2004/10/13 20:36:40+01:00 (none)!pb
reorder initscripts to make devices and udev play better together

BKrev: 416d90c7BonEBv7zQf5T56t8D_tI3g
---
 initscripts/initscripts-1.0/devices  |  5 +++++
 initscripts/initscripts-1.0/sysfs.sh | 11 +++++++++++
 initscripts/initscripts_1.0.oe       |  7 ++++---
 3 files changed, 20 insertions(+), 3 deletions(-)

(limited to 'initscripts')

diff --git a/initscripts/initscripts-1.0/devices b/initscripts/initscripts-1.0/devices
index 9820f363c6..141a60d59e 100644
--- a/initscripts/initscripts-1.0/devices
+++ b/initscripts/initscripts-1.0/devices
@@ -5,6 +5,11 @@
 
 . /etc/default/rcS
 
+# exit without doing anything if udev is active
+if test -x /bin/pidof -a "`pidof udevd`" != "" then
+	exit 0
+fi
+
 if test -e /dev/.devfsd
 then
 	if test "$VERBOSE" != "no"; then echo -n "Setting up device links for devfs: "; fi
diff --git a/initscripts/initscripts-1.0/sysfs.sh b/initscripts/initscripts-1.0/sysfs.sh
index e69de29bb2..4486128ad5 100644
--- a/initscripts/initscripts-1.0/sysfs.sh
+++ b/initscripts/initscripts-1.0/sysfs.sh
@@ -0,0 +1,11 @@
+#!/bin/sh
+
+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
+fi
+
+exit 0
diff --git a/initscripts/initscripts_1.0.oe b/initscripts/initscripts_1.0.oe
index 9183388ff0..7141966551 100644
--- a/initscripts/initscripts_1.0.oe
+++ b/initscripts/initscripts_1.0.oe
@@ -4,7 +4,7 @@ SECTION = "base"
 PRIORITY = "required"
 DEPENDS = "makedevs"
 RDEPENDS = "makedevs"
-PR = "r15"
+PR = "r16"
 
 SRC_URI = "file://halt \
            file://ramdisk \
@@ -98,8 +98,9 @@ do_install () {
 	ln -sf		../init.d/bootmisc.sh	${D}/etc/rcS.d/S55bootmisc.sh
 #	ln -sf		../init.d/urandom	${D}/etc/rcS.d/S55urandom
 	ln -sf		../init.d/finish	${D}/etc/rcS.d/S99finish
-	ln -sf		../init.d/devices	${D}/etc/rcS.d/S01devices
-	ln -sf		../init.d/sysfs.sh	${D}/etc/rcS.d/S36sysfs
+	ln -sf		../init.d/devices	${D}/etc/rcS.d/S04devices
+	# udev will run at S03 if installed
+	ln -sf		../init.d/sysfs.sh	${D}/etc/rcS.d/S02sysfs
 	ln -sf		../init.d/devpts.sh	${D}/etc/rcS.d/S38devpts.sh
 
 	install -m 0755    ${WORKDIR}/device_table.txt		${D}/etc/device_table
-- 
cgit v1.2.3