summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--initrd/distro-specs/suse/functions-10.08
-rw-r--r--initrd/distro-specs/suse/functions-10.18
-rw-r--r--initrd/distro-specs/suse/functions-9.310
-rw-r--r--initrd/distro-specs/ubuntu/functions-5.106
-rwxr-xr-xinitrd/initrd-stuff/bin/hwautocfg3
-rwxr-xr-xinitrd/initrd-stuff/init7
-rwxr-xr-xinitrd/mkdxsinitrd12
7 files changed, 36 insertions, 18 deletions
diff --git a/initrd/distro-specs/suse/functions-10.0 b/initrd/distro-specs/suse/functions-10.0
index da7891f8..881378bb 100644
--- a/initrd/distro-specs/suse/functions-10.0
+++ b/initrd/distro-specs/suse/functions-10.0
@@ -3,7 +3,7 @@
# changes should be done there, version specific changes for
# the 10.0 here.
#
-# Author(s): Dirk von Suchodoletz <dirk@goe.net>, 06-02-2006
+# Author(s): Dirk von Suchodoletz <dirk@goe.net>, 16-02-2006
# Blabla
# Blub
#
@@ -11,6 +11,11 @@
#
# Version: 0.2.1c
+#
+postinit () {
+:
+}
+
# udev service
udev_hotplug () {
local result=0
@@ -69,4 +74,3 @@ if [ "x$start_dreshal" = "xyes" ]; then
fi
fi
}
-
diff --git a/initrd/distro-specs/suse/functions-10.1 b/initrd/distro-specs/suse/functions-10.1
index 444c0f1f..267b4a53 100644
--- a/initrd/distro-specs/suse/functions-10.1
+++ b/initrd/distro-specs/suse/functions-10.1
@@ -3,13 +3,13 @@
# changes should be done there, version specific changes for
# the 10.0 here.
#
-# Author(s): Dirk von Suchodoletz <dirk@goe.net>, 09-02-2006
+# Author(s): Dirk von Suchodoletz <dirk@goe.net>, 16-02-2006
# Blabla
# Blub
#
# Copyright: (c) 2006 - RZ Universitaet Freiburg
#
-# Version: 0.2.1c
+# Version: 0.2.1d
# distro specific stuff to initialize
preinit () {
@@ -23,6 +23,10 @@ done
echo -e "#!/bin/sh\n:" >/usr/sbin/alsactl
chmod u+x /sbin/* /lib/udev/* /usr/sbin/*
}
+postinit () {
+:
+}
+
# udev service
udev_hotplug () {
diff --git a/initrd/distro-specs/suse/functions-9.3 b/initrd/distro-specs/suse/functions-9.3
index 9630a3a4..8de50678 100644
--- a/initrd/distro-specs/suse/functions-9.3
+++ b/initrd/distro-specs/suse/functions-9.3
@@ -14,9 +14,15 @@
# distro specific stuff to initialize
preinit () {
- # do nothing yet
- :
+# do nothing yet
+:
}
+postinit () {
+# for some reason the udev daemon does not create the needed device files
+udevstart
+}
+
+
# udev/hotplug - auto device discovery service
udev_hotplug () {
diff --git a/initrd/distro-specs/ubuntu/functions-5.10 b/initrd/distro-specs/ubuntu/functions-5.10
index fd1cd0f1..85dd0f3f 100644
--- a/initrd/distro-specs/ubuntu/functions-5.10
+++ b/initrd/distro-specs/ubuntu/functions-5.10
@@ -2,7 +2,7 @@
# linux diskless clients (executed within initial
# ramdisk after genconfig)
#
-# Author(s): Dirk von Suchodoletz <dirk@goe.net>, 29-01-2006
+# Author(s): Dirk von Suchodoletz <dirk@goe.net>, 16-02-2006
# Nico Dietrich
# Felix Endres
#
@@ -19,6 +19,10 @@ preinit () {
modprobe ${MODPRV} unix || error " Failed to load the \"unix\" module. \
Problems with Hardware detection will probably arise"
}
+preinit () {
+:
+}
+
# AUS SuSE-9.3
# udev/hotplug - auto device discovery service
udev_hotplug () {
diff --git a/initrd/initrd-stuff/bin/hwautocfg b/initrd/initrd-stuff/bin/hwautocfg
index a0bbb027..29cf98b8 100755
--- a/initrd/initrd-stuff/bin/hwautocfg
+++ b/initrd/initrd-stuff/bin/hwautocfg
@@ -437,8 +437,5 @@ echo -e "\tloadkeys -q ${KEYTABLE}\n" >>/mnt/etc/${D_INITDIR}/boot.ld
configuration file generated by hwsetup could not\n be found." nonfatal
displaysetup ${D_XF86CONFFILE}
-# suse 9.3: because the detected devices nodes are stored and lost, initialize them again!
-# udevstart
-
echo "finished" > /tmp/hwcfg
diff --git a/initrd/initrd-stuff/init b/initrd/initrd-stuff/init
index 77ff0212..b1858d72 100755
--- a/initrd/initrd-stuff/init
+++ b/initrd/initrd-stuff/init
@@ -397,17 +397,18 @@ d_mkbootld close
# IP configuration is made and should not be updated automatically, udevd
# should be killed if started within init
killall -9 dhcpcd dhclient pump 2>/dev/null
-# unmount the bind mounted modules directory
#bash
+# post init for some distro specific
+postinit
+
+# unmount the bind mounted modules directory
for i in 0 40 100 200 300 500 800 1000 1200; do
usleep $i && umount -n /lib/modules/${KERNEL} 2>/dev/null && break
error " Waited $i ticks to unmount kernel module directory ..." nonfatal
done
-
-
[ $i -gt 1000 ] && error " Unmount of the kernel modules directory \
failed for some reason. Some\n modprobe still active!?"
# check for inittab file
diff --git a/initrd/mkdxsinitrd b/initrd/mkdxsinitrd
index d7461fe4..2baf3573 100755
--- a/initrd/mkdxsinitrd
+++ b/initrd/mkdxsinitrd
@@ -3,11 +3,11 @@
# Description: universal (distro independent) generator for initial
# ramdisks for linux diskless clients
#
-# Author(s): Dirk von Suchodoletz <dirk@goe.net>, 06-02-2006
+# Author(s): Dirk von Suchodoletz <dirk@goe.net>, 16-02-2006
# Nico Dietrich
# Blub
#
-# Version: 0.3.1a
+# Version: 0.3.1b
#
# Copyright: (c) 2003 - 2006 - RZ Universitaet Freiburg
@@ -386,14 +386,16 @@ mkdir -p ${INSTDIR}/var/lib/nfs/state
# if nbd
# cobi nbd-client bin
if [ -n "${FSMODULES}" ] ; then
- case "${FSMODULES}" in
- *dnbd*)
+for i in ${FSMODULES}; do
+ case "$i" in
+ dnbd)
cobi dnbd-client bin
;;
- *nbd*)
+ nbd)
cobi nbd-client bin
;;
esac
+done
fi
# distro specific additional stuff