From ab07e56981ce6048ee006ac1c7bfb6b767079fb6 Mon Sep 17 00:00:00 2001 From: Chris Larson 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 +++++++++++ 2 files changed, 16 insertions(+) (limited to 'initscripts/initscripts-1.0') 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 -- cgit v1.2.3