X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=grml-terminalserver;h=1314205d3bdc3355c2e422f2c3b360d89c712b64;hb=3d819f3ecdfbaa6af4c723f22bdfe3c54dcacc6b;hp=3fcfa3713fb470b08cfabcc1297f2893e272ec2b;hpb=d50dcea8226b9df4931b2bf52970dcc7f8083cc3;p=grml-terminalserver.git

diff --git a/grml-terminalserver b/grml-terminalserver
index 3fcfa37..1314205 100755
--- a/grml-terminalserver
+++ b/grml-terminalserver
@@ -38,8 +38,8 @@ function printUsage
   cat <<EOT
 Usage: "$PROG_NAME__" [OPTIONS] <command>
 
-$PROG_NAME__ is the config program for the terminalserver
-comming with grml.
+$PROG_NAME__ is the configuration program for the terminalserver
+provided by Grml.
 
 COMMANDS:
    help             This help text
@@ -154,7 +154,7 @@ function runIptables
 
 function startIptables
 {
-  if [ -x /sbin/iptables ] ; then
+  if [ -x $(command -v iptables) ] ; then
     if [[ $NAT_INTERFACE_ != "" ]]; then
        local nat_source_ip_=`netGetIp "$NAT_INTERFACE_" warn`
 
@@ -176,7 +176,7 @@ function startIptables
        fi
     fi
   else
-    warn "iptables executable not avilable"
+    warn "iptables executable not available"
   fi
 }
 
@@ -185,7 +185,7 @@ function stopIptables
   if [[ $IPTABLES_SNAT_ != "true" ]]; then
     return
   fi
-  if [ -x /sbin/iptables ] ; then
+  if [ -x $(command -v iptables) ] ; then
     if [[ $NAT_INTERFACE_ != "" ]]; then
        local nat_source_ip_=`netGetIp "$NAT_INTERFACE_" warn`
 
@@ -221,12 +221,16 @@ function createTftpConf
   execute "install -m 644 $PXE_BOOT_MSG_ $TFTPD_DATA_DIR_" die
   [ -f "$PXE_BOOT_LOGO_" ] && execute "install -m 644 $PXE_BOOT_LOGO_ $TFTPD_DATA_DIR_" die
 
+  # PXE / BIOS boot (pxelinux)
   execute "source $TEMPLATE_CONFIG_DIR_/grub-pxelinux_config" die
+
+  # PXE / EFI boot (GRUB)
+  execute "source $TEMPLATE_CONFIG_DIR_/grub-shim_config" die
 }
 
 function stopTftp
 {
-  start-stop-daemon --stop --quiet -p "$TFTPD_PID_"
+  start-stop-daemon --stop --quiet -p "$TFTPD_PID_" --user nobody
 }
 function startTftp
 {
@@ -434,7 +438,7 @@ if [ "$1" == 'start' ]; then
   esac
 fi
 if [ $check_necessary_files_ == 'yes' ]; then
-  # test for files absolutly necessary for grml-terminalserver and created from -config
+  # test for files absolutely necessary for grml-terminalserver and created from -config
   problem_=0
   for i in $PATH_/initrd.img; do
     isExistent $i warn || problem_=1