fixes and cleanups within installer, see #51 too

git-svn-id: http://svn.openslx.org/svn/openslx/ld4@210 95ad53e4-c205-0410-b2fa-d234c58c8868

1 files changed, 7 insertions, 45 deletions

diff --git a/installer/default_files/dhcpd.conf b/installer/default_files/dhcpd.conf
index bb80527b..1551b5d6 100644
--- a/installer/default_files/dhcpd.conf
+++ b/installer/default_files/dhcpd.conf
@@ -22,17 +22,7 @@ option hw-mouse code 252          = string;
 option hw-graphic code 253        = string;
 option hw-monitor code 254        = string;
 
-###################################################################
-#####                                                         #####
-#####      !!! vendor identifier dependend settings !!!       #####
-#####                                                         #####
-###################################################################
-
-class "Etherboot" {
-    match if substring (option vendor-class-identifier, 0, 9) = "Etherboot";
-        option motdline1  = "Welcome to Guru Labs classroom";
- 	option vendor-encapsulated-options 3c:09:45:74:68:65:72:62:6f:6f:74:ff;
-}
+# most of these options could be defined via machine-setup.default
 
 ###################################################################
 #####                                                         #####
@@ -49,22 +39,6 @@ next-server			   @@@server@@@;
 #####                                                         #####
 ###################################################################
 # description for several options:
-# A. x-server-defs "de PS/2 psaux 96 100 1280x1024 nv 16"
-#  - Sets several values for XFree86 V 4.0.X
-#
-#  1. keyboard  de/us
-#  2. mouse typ PS/2/MouseMan/MicroSoft/... 
-#  3. mouse device psaux/ttyS0X
-#  4. horiz. freq. monitor 40 - 96 (depending on monitor)
-#  5. vert. freq. monitor 56 -120  (depending on monitor)
-#  6. max. resolution
-#  7. graphic server module  mga/i810/nv/ati/... (depends on hardware)
-#  8. display color depth 8/16/24
-#
-# you will need the x-display-manager because
-# it is required by dhclient.conf.
-# change "require" within this file
-#
 #    option x-display-manager server01,server02,server03;
 #    option netbios-name-servers 13.30.19.254;
 #    option ntp-servers ntps1,ntps2,ntps3;
@@ -108,26 +82,18 @@ group {
 
     if substring(option vendor-class-identifier,0,3) = "PXE" {
 	allow booting;
-        filename "/tftpboot/pxelinux.0"; }
+        filename "@@@tftpbootdir@@@/pxelinux.0"; }
     elsif substring(option vendor-class-identifier,0,3) = "DXS" {
 	allow booting; }
     elsif substring(option vendor-class-identifier,0,4) = "MSFT" {
         allow booting; }
-#        option start-x "windowmaker";
-#	 option start-xdmcp "no";
-#	 option start-rwhod "no";
-#	 option start-cron "no";
-#	 option start-snmp "no"; }
-#    elsif substring(option vendor-class-identifier,0,9) = "Etherboot" {
-#	allow booting;
-#       filename "/nfsroot/dxs2/boot/bootimg"; }
-    else { ignore booting; }
-
-#    option root-path "/nfsroot/dxs2";
+#    else { ignore booting; }
+
+#    option root-path "@@@rootpath@@@";
     option domain-name-servers 132.230.200.200,132.230.200.201;
-    option domain-name "lp.ruf.uni-freiburg.de ruf.uni-freiburg.de uni-freiburg.de dxs.local";
+    option domain-name "dxs.site";
     option ntp-servers 132.230.1.9;
-    option crontab-entries "59 21  * * * root shutdown -h now";
+#    option crontab-entries "59 21  * * * root shutdown -h now";
 #    option lpr-servers 10.22.9.254;
 #    option nis-servers 10.16.10.11;
 #    option nis-domain "linuxpc";
@@ -146,7 +112,6 @@ group {
 #    option hw-monitor "30-65kHz 58-76Hz 1280x1024";
 #    option hw-graphic "nv 15";
     option bootlocal-script "";
-    option o129 "vga=0x0317 apic";
 
 ###################################################################
 #####                                                         #####
@@ -159,9 +124,6 @@ group {
     option crontab-entries "";
 #   group specific options:
 
-#   group ip management:
-###################################################################
-# Grafikstation
     host example1 {
         hardware ethernet 00:02:B3:8D:83:12;
         fixed-address @@@example1@@@;