aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBill Nottingham <notting@redhat.com>2004-02-01 01:46:08 +0000
committerBill Nottingham <notting@redhat.com>2004-02-01 01:46:08 +0000
commit1d7cc1a9b5c349ccbf602a6257e7faeee9c61bb8 (patch)
tree7939ffe74ea72986f37c22186aecad8c045459bd
parent749bbab65874bc19af50e6ea308c18c6b6484c04 (diff)
downloadinitscripts-1d7cc1a9b5c349ccbf602a6257e7faeee9c61bb8.tar
initscripts-1d7cc1a9b5c349ccbf602a6257e7faeee9c61bb8.tar.gz
initscripts-1d7cc1a9b5c349ccbf602a6257e7faeee9c61bb8.tar.bz2
initscripts-1d7cc1a9b5c349ccbf602a6257e7faeee9c61bb8.tar.xz
initscripts-1d7cc1a9b5c349ccbf602a6257e7faeee9c61bb8.zip
more cleanups
-rwxr-xr-xrc.d/rc.sysinit22
1 files changed, 13 insertions, 9 deletions
diff --git a/rc.d/rc.sysinit b/rc.d/rc.sysinit
index 06bbdb50..eccbf73c 100755
--- a/rc.d/rc.sysinit
+++ b/rc.d/rc.sysinit
@@ -14,6 +14,11 @@ fi
[ -e /dev/.devfsd -a -x /sbin/devfsd ] && /sbin/devfsd /dev
HOSTNAME=`/bin/hostname`
+HOSTTYPE=`uname -m`
+unamer=`uname -r`
+eval version=`echo $unamer | awk -F '.' '{ print "(" $1 " " $2 ")" }'`
+
+
if [ -f /etc/sysconfig/network ]; then
. /etc/sysconfig/network
fi
@@ -27,8 +32,6 @@ mount -n -t sysfs /sys /sys >/dev/null 2>&1
. /etc/init.d/functions
-HOSTTYPE=`uname -m`
-
if [ "$HOSTTYPE" != "s390" -a "$HOSTTYPE" != "s390x" ]; then
last=0
for i in `LC_ALL=C grep '^[0-9].*respawn:/sbin/mingetty' /etc/inittab | sed 's/^.* tty\([0-9][0-9]*\).*/\1/g'`; do
@@ -172,7 +175,7 @@ cmdline=$(cat /proc/cmdline)
# Initialiaze ACPI bits
if [ -d /proc/acpi ]; then
- for module in /lib/modules/`uname -r`/kernel/drivers/acpi/* ; do
+ for module in /lib/modules/$unamer/kernel/drivers/acpi/* ; do
insmod $module
done
fi
@@ -204,9 +207,13 @@ fi
needusbstorage=
if [ $usb = "1" ]; then
needusbstorage=`LC_ALL=C grep -e "^I.*Cls=08" /proc/bus/usb/devices 2>/dev/null`
- LC_ALL=C fgrep 'hid' /proc/bus/usb/drivers || action $"Initializing USB HID interface: " modprobe hid 2> /dev/null
- action $"Initializing USB keyboard: " modprobe keybdev 2> /dev/null
- action $"Initializing USB mouse: " modprobe mousedev 2> /dev/null
+ # If you are running 2.6, and you built your own modular mouse/keyboard drivers
+ # get them via hotplug. (and if it's your boot keyboard, build them in! :)
+ if [ "${version[0]}" -lt "3" -a "${version[1]}" -lt "6" ]; then
+ LC_ALL=C fgrep 'hid' /proc/bus/usb/drivers || action $"Initializing USB HID interface: " modprobe hid 2> /dev/null
+ action $"Initializing USB keyboard: " modprobe keybdev 2> /dev/null
+ action $"Initializing USB mouse: " modprobe mousedev 2> /dev/null
+ fi
fi
if [ -f /fastboot ] || strstr "$cmdline" fastboot ; then
@@ -391,9 +398,6 @@ if ! strstr "$cmdline" nomodules && [ -f /proc/modules ] ; then
USEMODULES=y
fi
-unamer=`uname -r`
-eval version=`echo $unamer | awk -F '.' '{ print "(" $1 " " $2 ")" }'`
-
# tweak isapnp settings if needed.
if [ -n "$PNP" -a -f /proc/isapnp -a -x /sbin/sndconfig ]; then
/sbin/sndconfig --mungepnp >/dev/null 2>&1