diff options
| -rwxr-xr-x | initramfs/initrd-stuff/bin/hwautocfg | 10 | ||||
| -rw-r--r-- | installer/default_files/machine-setup.default | 3 | ||||
| -rwxr-xr-x | installer/ld4-inst | 4 |
3 files changed, 9 insertions, 8 deletions
diff --git a/initramfs/initrd-stuff/bin/hwautocfg b/initramfs/initrd-stuff/bin/hwautocfg index edf77430..22848751 100755 --- a/initramfs/initrd-stuff/bin/hwautocfg +++ b/initramfs/initrd-stuff/bin/hwautocfg @@ -3,7 +3,7 @@ # universal (distro independent) hardware autoconfiguration script for # OpenSLX linux diskless clients, using hwconfig from knoppix as base tool # -# Dirk von Suchodoletz <dvs@OpenSLX.com>, 03-09-2006 +# Dirk von Suchodoletz <dvs@OpenSLX.com>, 19-09-2006 # # (c) 2003 - 2006 - RZ Universitaet Freiburg # (c) 2006 - OpenSLX.org @@ -368,9 +368,10 @@ if strinfile "SCSI" /tmp/hwsetup.info ; then strinfile "CDROM" /tmp/hwsetup.info && { modprobe ${MODPRV} sr_mod; modprobe ${MODPRV} sg; } strinfile "HD" /tmp/hwsetup.info && modprobe ${MODPRV} sd_mod + # check if a (scsi) scanner was detected strinfile "SCANNER" /tmp/hwsetup.info && \ echo -e 'KERNEL=="sg*",\t\tNAME="%k", GROUP="disk", MODE="666"' \ - >> /mnt/etc/udev/rules.d/04-scanner.rules + >> /tmp/scanner-udev fi # fixme - psmouse entladen, falls nicht vorhanden @@ -432,9 +433,12 @@ done # determine if tmp preparation should wait for format/mount or not [ -z "$part44" ] && echo "finished" > /tmp/tmpready -# wait for completion of clients root filesystem in /mnt +# wait for completion of clients root filesystem in /mnt and add +# previously generated files to /mnt/etc ... waitfor /tmp/fscmpl 40000 [ -f /tmp/fstab ] && cat /tmp/fstab >> /mnt/etc/fstab +[ -f /tmp/scanner-udev ] && cat /tmp/scanner-udev \ + >> /mnt/etc/udev/rules.d/04-scanner.rules # add entries to initialize keytable and consolefont to boot.ld # postpone some commands into normal bootup environment diff --git a/installer/default_files/machine-setup.default b/installer/default_files/machine-setup.default index 86a6b7d6..47209528 100644 --- a/installer/default_files/machine-setup.default +++ b/installer/default_files/machine-setup.default @@ -71,9 +71,6 @@ start_dreshal="yes" # start alsa sound system start_alsasound="yes" -# start ssh server -start_sshd="yes" - # smb protocol service (provide windows file service) start_samba="may" netbios_workgroup="dxs-network" diff --git a/installer/ld4-inst b/installer/ld4-inst index bb11d364..12a23626 100755 --- a/installer/ld4-inst +++ b/installer/ld4-inst @@ -4,7 +4,7 @@ # cloning from rsync source for Diskless X Stations (v4.0) # # Author(s): Nico Dietrich, 04-04-2006 -# Dirk von Suchodoletz <dirk@goe.net>, 18-09-2006 +# Dirk von Suchodoletz <dirk@goe.net>, 19-09-2006 # Michael Janczyk, <mj0>, 06-07-2006 # # Copyright: (c) 2003, 2006 - RZ Universitaet Freiburg @@ -355,7 +355,7 @@ kernel_choice "${kernel_choice}" fi choice=( ${kernel_choice} ) # make sure /$tftbootdir exists - mkdir -p ${tftpbootdir} + mkdir -p ${tftpbootdir}/pxelinux.cfg 2>/dev/null declare -i j=0 # add nfs modules nevertheless |