X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=grml-terminalserver-config;h=324758038608091cb2f8addd711f92e431d56b4b;hb=9a40ef030a37167410d3c073ec3a279421ef56d4;hp=9417c8687ed9fe53fb357bf615e6618a44521e2b;hpb=3ab00dded2cbcb7189c3589aa146854a31d3f112;p=grml-terminalserver.git

diff --git a/grml-terminalserver-config b/grml-terminalserver-config
index 9417c86..3247580 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,16 +527,12 @@ 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
-    CC='gcc-3.4'
-  else # assume we have gcc-3.3
-    CC='gcc-3.3'
-  fi
-  [ -r /lib64 ] && CC="$CC -m32"
 
-  execute "CC=$CC ./configure --enable-preset-menu=./preset-menu $cmd_line_" warn || read
-  execute "make -j2 CC=$CC" warn || read #return 1
+  CC='gcc'
+  [ -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"