some fixes and addons ...

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

3 files changed, 12 insertions, 26 deletions

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}