X-Git-Url: https://git.grml.org/?a=blobdiff_plain;f=grml-terminalserver-config;h=d073ed98784332b6ff5e4a9ad3fd5b9f0fc20860;hb=2138e71da77b2e41fa3913748c22316553928acf;hp=ea8777a6a0b953bc6ab290780ec1aa7683def0f2;hpb=ff0fabd6a587444011e34f295f215d47d4bf36f2;p=grml-terminalserver.git

diff --git a/grml-terminalserver-config b/grml-terminalserver-config
index ea8777a..d073ed9 100755
--- a/grml-terminalserver-config
+++ b/grml-terminalserver-config
@@ -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
 
 
 "
@@ -528,13 +527,11 @@ timeout 0
 title Load config from Tftp server
   configfile (nd)/menu.lst
 EOT
-  #execute "./configure --enable-diskless --enable-preset-menu=./preset-menu $cmd_line_" warn || read
-  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"
+
+  [ -x /usr/bin/gcc-3.3 ] && export CC='gcc-3.3'
+  [ -x /usr/bin/gcc-3.4 ] && export CC='gcc-3.4'
+  [ -x /usr/bin/gcc-4.1 ] && export CC='gcc-4.1'
+  [ -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