Update for new grml-terminalserver-data package, fixed typo, removed bootoption secure

[grml-terminalserver.git] / grml-terminalserver-config

diff --git a/grml-terminalserver-config b/grml-terminalserver-config
index aa45405..194ad98 100755 (executable)
--- a/grml-terminalserver-config
+++ b/grml-terminalserver-config
@@ -4,7 +4,7 @@
 # Authors:       grml-team (grml.org), (c) Michael Gebetsroither <gebi@grml.org>
 # Bug-Reports:   see http://grml.org/bugs/
 # License:       This file is licensed under the GPL v2.
-# Latest change: Don Nov 16 14:39:51 CET 2006 [mika]
+# Latest change: Die Mär 27 13:34:47 CEST 2007 [mika]
 ################################################################################
 
 
@@ -397,9 +397,8 @@ Quite usefull examples:
 
 ssh=<pw>              - Start ssh server and set password of user grml to pw
 services=<1,2,3>      - Execute /etc/init.d/{1,2,3} start
-console=ttyS0,9600n8  - Initialise seriell console
-secure                - Boot only restricted clients (without root permissions)
-startx                - Boot into X (should be used with secure)
+console=ttyS0,9600n8  - Initialise serial console
+startx                - Boot into X
 
 
 "
@@ -529,8 +528,15 @@ title Load config from Tftp server
   configfile (nd)/menu.lst
 EOT
   #execute "./configure --enable-diskless --enable-preset-menu=./preset-menu $cmd_line_" warn || read
-  execute "CC=gcc-3.3 ./configure --enable-preset-menu=./preset-menu $cmd_line_" warn || read
-  execute "make -j2 CC=gcc-3.3" warn || read #return 1
+  if [ -x /usr/bin/gcc-3.4 ] ; then
+    export CC='gcc-3.4'
+  else # assume we have gcc-3.3
+    export CC='gcc-3.3'
+  fi
+  [ -r /lib64 ] && export CC="$CC -m32"
+
+  CC="$CC" execute "./configure --enable-preset-menu=./preset-menu $cmd_line_" warn || read
+  CC="$CC" execute "make -j2" warn || read #return 1
 
   local st1_="stage1/stage1"
   local st2_="stage2/stage2"