diff options
author | Dirk von Suchodoletz | 2006-02-06 23:07:08 +0100 |
---|---|---|
committer | Dirk von Suchodoletz | 2006-02-06 23:07:08 +0100 |
commit | c2e0aa11ed5542e2a35dba06479e37f4760116d3 (patch) | |
tree | 6c35e659a1d3500b8e428c0be296872a2ff3d267 | |
parent | Some tests with SuSE 10.1 revealed bugs in mkdxsinitrd. Added (diff) | |
download | core-c2e0aa11ed5542e2a35dba06479e37f4760116d3.tar.gz core-c2e0aa11ed5542e2a35dba06479e37f4760116d3.tar.xz core-c2e0aa11ed5542e2a35dba06479e37f4760116d3.zip |
Minor additions for preinit ...
git-svn-id: http://svn.openslx.org/svn/openslx/dxs/ld4@64 95ad53e4-c205-0410-b2fa-d234c58c8868
-rw-r--r-- | initrd/distro-specs/suse/functions-10.1 | 13 | ||||
-rwxr-xr-x | initrd/initrd-stuff/bin/hwautocfg | 4 | ||||
-rwxr-xr-x | initrd/initrd-stuff/init | 5 |
3 files changed, 17 insertions, 5 deletions
diff --git a/initrd/distro-specs/suse/functions-10.1 b/initrd/distro-specs/suse/functions-10.1 index 19b41e79..2979089e 100644 --- a/initrd/distro-specs/suse/functions-10.1 +++ b/initrd/distro-specs/suse/functions-10.1 @@ -1,4 +1,4 @@ -# Description: configuration functions for SuSE 10.0 which differ from +# Description: configuration functions for SuSE 10.1 which differ from # functions defined for SuSE 9.3 which is base ... General # changes should be done there, version specific changes for # the 10.0 here. @@ -11,10 +11,21 @@ # # Version: 0.2.1c +# distro specific stuff to initialize +preinit () { +for i in usb_id scsi_id vol_id edd_id hwup ; do + echo -e "#!/bin/sh\n:" >/sbin/$i +done +chmod u+x /sbin/* +} + # udev service udev_hotplug () { local result=0 echo "Starting udev" +mknod /dev/console c 5 1 +mknod /dev/null c 1 3 +mknod /dev/kmsg c 1 11 if [ -x /bin/udevd ] ; then echo "" > /proc/sys/kernel/hotplug udevd --daemon || result=1 diff --git a/initrd/initrd-stuff/bin/hwautocfg b/initrd/initrd-stuff/bin/hwautocfg index 660f201c..819ffc75 100755 --- a/initrd/initrd-stuff/bin/hwautocfg +++ b/initrd/initrd-stuff/bin/hwautocfg @@ -4,7 +4,7 @@ # script for linux diskless clients, using hwconfig from # knoppix as base tool # -# Author(s): Dirk von Suchodoletz <dirk@goe.net>, 03-02-2006 +# Author(s): Dirk von Suchodoletz <dirk@goe.net>, 06-02-2006 # Blabla # Blub # @@ -323,7 +323,7 @@ for DRIVER in cmd64x hpt366 piix slc90e66 cs5520 it821x rz1000 \ DRIVERLIST="${DRIVERLIST} ${DRIVER}"; } done # check for IDE/SCSI (SATA) - incomplete list -for DRIVER in ata_piix sata_via; do +for DRIVER in ata_piix sata_via sata_nv; do strinfile " ${DRIVER}" /tmp/hwsetup.info && { #SCSIIDE="yes" modprobe ${MODPRV} ${DRIVER} & diff --git a/initrd/initrd-stuff/init b/initrd/initrd-stuff/init index 112c1539..e066bae2 100755 --- a/initrd/initrd-stuff/init +++ b/initrd/initrd-stuff/init @@ -19,9 +19,11 @@ functionality. Without this\ninit script will not run." . /etc/sysconfig/config || ( echo -e " The distribution \ specific configuration file could not be found" && exit 1 ) +# run pre init script +preinit date export PATH=/bin:/sbin:/usr/bin/:/usr/sbin -export date="17-01-2006" +export date="07-02-2006" exec < /dev/console > /dev/console 2>&1 export KERNEL="@@@KERNVER@@@" @@ -39,7 +41,6 @@ echo 256 > /proc/sys/kernel/real-root-dev [ ! -d /sys/class ] && mount -n -t sysfs sysfs /sys # start device auto discovery service - distro specific function -bash udev_hotplug # read kernel commandline TMPFSSIZE="50%" |