diff options
| -rw-r--r-- | initrd/distro-specs/ubuntu/functions-5.10 | 14 | ||||
| -rw-r--r-- | initrd/initrd-stuff/etc/messages | 7 | ||||
| -rw-r--r-- | installer/default_files/default | 4 | ||||
| -rw-r--r-- | installer/default_files/dhcpd.conf | 20 | ||||
| -rwxr-xr-x | installer/ld4-inst | 14 |
5 files changed, 21 insertions, 38 deletions
diff --git a/initrd/distro-specs/ubuntu/functions-5.10 b/initrd/distro-specs/ubuntu/functions-5.10 index 951a836a..2e393b4a 100644 --- a/initrd/distro-specs/ubuntu/functions-5.10 +++ b/initrd/distro-specs/ubuntu/functions-5.10 @@ -2,13 +2,13 @@ # linux diskless clients (executed within initial # ramdisk after genconfig) # -# Author(s): Dirk von Suchodoletz <dirk@goe.net>, 31-03-2006 +# Author(s): Dirk von Suchodoletz <dirk@goe.net>, 05-04-2006 # Nico Dietrich # Felix Endres # # Copyright: (c) 2006 - RZ Universitaet Freiburg # -# Version: 0.2.1d +# Version: 0.2.1e # distro specific stuff to initialize preinit () { @@ -17,8 +17,7 @@ preinit () { echo "dhcp:x:101:101::/nonexistent:/bin/false" >>/etc/passwd # load unix module to provide sockets - modprobe ${MODPRV} unix || error " Failed to load the \"unix\" module. \ - Problems with Hardware detection\nwill probably arise" + modprobe ${MODPRV} unix || error "$df_errumod" } postinit () { @@ -121,8 +120,7 @@ if [ "x$start_cron" = "xyes" ] ; then \nMAILTO=\n-*/15 * * * *\troot\ttest -x /usr/lib/cron/run-crons && \ /usr/lib/cron/run-crons >/dev/null 2>&1\n" >/mnt/etc/crontab else - error " The cron start script seems not to be installed, so requesting \ -\n the start of cron services make no sense." nonfatal + error "$df_errcron" nonfatal fi fi } @@ -249,9 +247,7 @@ if [ -f /mnt/etc/init.d/autofs ] ; then if [ -n "${automnt_src}" ] ; then # local directory and home directory server from machine-setup [ -z "${automnt_dir}" ] && automnt_dir="/home" - strinstr "/" "${automnt_dir}" && error " Only toplevel directories \ -are allowed as mount points for user home\n directories. Please set the \ -variable \${automnt_dir} appropriately in\n machine-setup file." nonfatal + strinstr "/" "${automnt_dir}" && error "$df_erratpld" nonfatal automnt_dir=${automnt_dir#/} echo -e "/home\t/etc/auto.${automnt_dir}\n" >> /mnt/etc/auto.master echo -e "# /etc/auto.${automnt_dir} created by $0:\n" \ diff --git a/initrd/initrd-stuff/etc/messages b/initrd/initrd-stuff/etc/messages index c7adeb3e..5806e28e 100644 --- a/initrd/initrd-stuff/etc/messages +++ b/initrd/initrd-stuff/etc/messages @@ -3,11 +3,11 @@ # version 4 # this file could be used for localization of error messages # -# Author(s): Dirk von Suchodoletz <dirk@goe.net>, 03-04-2006 +# Author(s): Dirk von Suchodoletz <dirk@goe.net>, 05-04-2006 # # Copyright: (c) 2006 - RZ Universitaet Freiburg # -# Version: 0.0.3b +# Version: 0.0.3c # messages from init init_errmsg="functions file contains a lot of script \ @@ -115,6 +115,8 @@ $error_dhcp" error_ldapcfg=" The configuration via ldap is not implemented yet." # messages from distro functions +df_errumod=" Failed to load the \"unix\" module. \ + Problems with Hardware detection\nwill probably arise" df_errserv="seems not to be installed or start script is not available\n \ so requesting the start of service make no sense. Please disable service\n \ or install the files needed." @@ -128,4 +130,3 @@ df_erramnt=" Automounter $df_errserv" df_erratpld=" Only toplevel directories \ are allowed as mount points for user home\n directories. Please set the \ variable \${automnt_dir} appropriately in\n machine-setup file." - diff --git a/installer/default_files/default b/installer/default_files/default index 2ec41b9f..28a5471f 100644 --- a/installer/default_files/default +++ b/installer/default_files/default @@ -2,9 +2,6 @@ # # Description: Boot selection with the new Syslinux/PXElinux by Peter Anwin # selection is done by cursor up and down keys -# Modification: Alexander Heinz -# Dirk von Suchodoletz <dirk@goe.net>, 23-09-2005 -# DEFAULT @@@server@@@::@@@tftpbootdir@@@/menu.c32 PROMPT 0 @@ -38,4 +35,3 @@ LABEL KERNEL @@@server@@@::@@@tftpbootdir@@@/menu.c32 APPEND @@@server@@@::@@@tftpbootdir@@@/pxelinux.cfg/default ##### - diff --git a/installer/default_files/dhcpd.conf b/installer/default_files/dhcpd.conf index 284d701c..d5790be2 100644 --- a/installer/default_files/dhcpd.conf +++ b/installer/default_files/dhcpd.conf @@ -1,15 +1,4 @@ ################################################################### -##### /etc/dhcpd.conf ##### -##### ##### -##### Configuration file for ISC dhcpd ##### -##### ##### -##### LAST MODIFIED ON 2004/10/19 ##### -##### BY mj0 ##### -##### ##### -##### (c) Dirk von Suchodoletz <dirk@goe.net>, 2002 ##### -################################################################### - -################################################################### ##### ##### ##### !!! user defined vendor options !!! ##### ##### ##### @@ -59,6 +48,7 @@ class "Etherboot" { ################################################################### server-identifier @@@server@@@; +next-server @@@server@@@; ################################################################### ##### ##### @@ -131,8 +121,6 @@ group { allow booting; } elsif substring(option vendor-class-identifier,0,4) = "MSFT" { allow booting; } -# elsif substring(option vendor-class-identifier,0,3) = "FLA" { -# allow booting; # option start-x "windowmaker"; # option start-xdmcp "no"; # option start-rwhod "no"; @@ -160,10 +148,10 @@ group { option netbios-workgroup "tux-net"; option tex-enable "yes"; option vmware "yes"; - option desktop-session "kde,gnome,windowsxp"; # VMWARE-IMAGE-ADMINISTER + option desktop-session "kde,gnome"; option language "de_DE de-latin1-nodeadkeys"; # option hw-mouse "ps/2 psaux"; - option hw-monitor "30-65kHz 58-76Hz 1280x1024"; +# option hw-monitor "30-65kHz 58-76Hz 1280x1024"; # option hw-graphic "nv 15"; option bootlocal-script ""; option o129 "vga=0x0317 apic"; @@ -171,7 +159,7 @@ group { ################################################################### ##### ##### ##### GROUP 1: ##### -##### Lehrstuhl (lsfks), Beratung ##### +##### example group ##### ##### ##### ################################################################### diff --git a/installer/ld4-inst b/installer/ld4-inst index f709352e..cf7ca126 100755 --- a/installer/ld4-inst +++ b/installer/ld4-inst @@ -3,8 +3,8 @@ # Description: Script for generating dxs filesystem by # cloning from rsync source for Diskless X Stations (v4.0) # -# Author(s): Nico Dietrich, 22-03-2006 -# Dirk von Suchodoletz <dirk@goe.net>, 03-04-2006 +# Author(s): Nico Dietrich, 04-04-2006 +# Dirk von Suchodoletz <dirk@goe.net>, 05-04-2006 # # Copyright: (c) 2003, 2006 - RZ Universitaet Freiburg # @@ -12,7 +12,7 @@ header() { echo - echo "Welcome to the LD4 installation" + echo "Welcome to the LD4 installation (please use lower case in input)" echo } @@ -330,9 +330,11 @@ setup_server () { sed -e "s,@@@tftpbootdir@@@,${tftpbootdir}," default_files/${atftpd_conf_name} > ${dxs_conf}/${dxs_atftpd_conf}-${timestamp} # nfs - echo -e "# Bla Blub\n \ - # NFS export entry for DXS\n\ - ${rootdir} ${netname}/${netmask}(ro,no_root_squash,async)" >> ${dxs_conf}/${dxs_exports_conf}-${timestamp} + echo -e "#/etc/exports - file generated by $0\n\ +# for backups of this file please check /etc/dxs directory\ +# NFS export entry for DXS\n\ +${rootdir} ${netname}/${netmask}(ro,no_root_squash,async)" \ + >> ${dxs_conf}/${dxs_exports_conf}-${timestamp} # pxe [ -d ${tftpbootdir} ] || mkdir -p ${tftpbootdir} |