X-Git-Url: https://git.grml.org/?a=blobdiff_plain;f=grml-terminalserver-config;h=a65edcbd8dcfb04c4c81dae2749e738bcec7da75;hb=ba6d33ea966f2daaf27cc247c323e0d30ba9f3e9;hp=0724675d444a1c5efef9450f29975fb93f0e605a;hpb=38520e623a2dcbf60a39f1b201f9a0bb0739c66d;p=grml-terminalserver.git

diff --git a/grml-terminalserver-config b/grml-terminalserver-config
index 0724675..a65edcb 100755
--- a/grml-terminalserver-config
+++ b/grml-terminalserver-config
@@ -123,7 +123,7 @@ function actionAutoconf
 function actionMkInitrd
 {
   echo "Creating initrd: $PATH_/minirt26.gz"
-  isExistent "$PATH_/minirt26.gz" && echo "$PATH_/minirt26.gz does allready exist, skipping initrd creation" && return 0
+  isExistent "$PATH_/minirt26.gz" && echo "$PATH_/minirt26.gz does already exist, skipping initrd creation" && return 0
   mkInitrd
   echo 'done'
 }
@@ -151,7 +151,7 @@ function mkInitrd
 
   # implanting my initrd changes into the original initrd
   
-  # copy programs, check if there are allready links with this name to busybox
+  # copy programs, check if there are already links with this name to busybox
   for i in $USR_SHARE_/discover* $USR_SHARE_/udhcpc $USR_SHARE_/udhcp-config.sh $USR_SHARE_/cdir $USR_SHARE_/rdir /usr/bin/ldd ;do
     tmp_name_="${i##*/}"
     isNotExistent "$INITRD_/static/$tmp_name_" eprint || execute "rm $INITRD_/static/$tmp_name_"
@@ -374,8 +374,10 @@ 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)
  
+
 "
   $DIALOG_ --clear --no-collapse --backtitle "$BACK_TITLE_" --title "$OPTIONS_TITLE_" --inputbox "$OPTIONS_BOOTARG_MESSAGE_" 0 0\
     2>$TMP_ || die "problems getting additional boot arguments"
@@ -457,7 +459,7 @@ function grubConfigWork
   local grub_title_="Grub configuration"
   local grub_nic_message_="
 Give me the types of network cards you would want to boot from.
-If you networkcard is allready listed press <OK>!
+If you networkcard is already listed press <OK>!
 
 WARNING: DON't add all NIC's, grub could possibly stop working!!"
   local nics_=""
@@ -499,7 +501,7 @@ 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 "./configure --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
 
   local st1_="stage1/stage1"
@@ -612,4 +614,4 @@ esac
 removeTmpFiles
 # END OF FILE
 ################################################################################
-# vim:foldmethod=marker
+# vim:foldmethod=marker tabstop=2 expandtab shiftwidth=2