summaryrefslogtreecommitdiffstats
path: root/initrd
diff options
context:
space:
mode:
authorNico Dietrich2006-02-01 17:24:11 +0100
committerNico Dietrich2006-02-01 17:24:11 +0100
commitdc0f1dd0c22ea1e60fbb7722aa11109c56f56a19 (patch)
tree91a452085611d0cb0e5aca9a1ec98259fbfd852f /initrd
parentImproved hardware detection, added SCSI/SATA drivers in hw detection (diff)
downloadcore-dc0f1dd0c22ea1e60fbb7722aa11109c56f56a19.tar.gz
core-dc0f1dd0c22ea1e60fbb7722aa11109c56f56a19.tar.xz
core-dc0f1dd0c22ea1e60fbb7722aa11109c56f56a19.zip
kleine fixes in init
git-svn-id: http://svn.openslx.org/svn/openslx/dxs/ld4@53 95ad53e4-c205-0410-b2fa-d234c58c8868
Diffstat (limited to 'initrd')
-rwxr-xr-xinitrd/initrd-stuff/bin/hwautocfg4
-rwxr-xr-xinitrd/initrd-stuff/init2
-rwxr-xr-xinitrd/mkdxsinitrd7
3 files changed, 10 insertions, 3 deletions
diff --git a/initrd/initrd-stuff/bin/hwautocfg b/initrd/initrd-stuff/bin/hwautocfg
index 6f78c125..35af9f10 100755
--- a/initrd/initrd-stuff/bin/hwautocfg
+++ b/initrd/initrd-stuff/bin/hwautocfg
@@ -317,7 +317,7 @@ Please check that\n hwsetup is properly installed and executable."
# "drivers" (pseudo, placeholder strings, ...) to exclude from loading
DRIVERLIST=" disabled unknown ignore pcspkr synaptics keybdev"
# driver blacklist (real modules which fail to load)
-DRIVERLIST=${DRIVERLIST}" hw_random"
+DRIVERLIST=${DRIVERLIST}" hw_random ichxrom"
# load ide drivers first, takes a while to initialize
for DRIVER in cmd64x hpt366 piix slc90e66 cs5520 it821x rz1000 \
triflex aec62xx cs5530 ns87415 sc1200 trm290 alim15x3 \
@@ -390,7 +390,7 @@ if [ -n "$IDE" ] ; then
strinfile "HD" /tmp/hwsetup.info && modprobe ${MODPRV} ide_disk &
fi
if [ -n "$SCSIIDE" ] ; then
- strinfile "CDROM" /tmp/hwsetup.info && modprobe ${MODPRV} sr_mod sg
+ strinfile "CDROM" /tmp/hwsetup.info && modprobe -a ${MODPRV} sr_mod sg
strinfile "HD" /tmp/hwsetup.info && modprobe ${MODPRV} sd_mod &
fi )
# cdrom/dvd und plattenkonfig. ergaenzen. Module sind hier geladen und
diff --git a/initrd/initrd-stuff/init b/initrd/initrd-stuff/init
index 56d3cb0f..db9546a5 100755
--- a/initrd/initrd-stuff/init
+++ b/initrd/initrd-stuff/init
@@ -46,7 +46,7 @@ if [ -x /bin/udev -a -x /bin/udevstart ] ; then
export UDEVD_EXPECTED_SEQNUM=$(cat /sys/kernel/hotplug_seqnum)
export UDEVD_EVENT_TIMEOUT=1
echo "" > /proc/sys/kernel/hotplug
- udevd --daemon
+ udevd --daemon &
fi
elif [ -x /bin/hotplug ] ; then
echo "Enabling hotplug"
diff --git a/initrd/mkdxsinitrd b/initrd/mkdxsinitrd
index c3679b6b..546c7124 100755
--- a/initrd/mkdxsinitrd
+++ b/initrd/mkdxsinitrd
@@ -400,6 +400,13 @@ for bbins in udev udevd udevstart
cobi ${bbins} bin || echo "Program ${bbins} not found"
done
+# in suse 9.3 it could be better to use udev.static etc
+#for bbins in udev udevd udevstart
+#do
+# cobi ${bbins}.static bin || echo "Program ${bbins}.static not found"
+# ln -s /bin/${bbins}.static ${INSTDIR}/bin/${bbins}
+#done
+
# if nfs
mkdir -p ${INSTDIR}/var/lib/nfs/state