X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=grml-terminalserver-config;h=a1c9db102352cc7aee5a4b3197111efbee0da921;hb=d7145e7d45654a701befce0d6ec5dddeb2a8a017;hp=0d7c9927acfb0e9bb219459dde788c5c7fdf267d;hpb=ef76f0104aaa9aba3b79d601378ddc44c9ffe9fd;p=grml-terminalserver.git

diff --git a/grml-terminalserver-config b/grml-terminalserver-config
index 0d7c992..a1c9db1 100755
--- a/grml-terminalserver-config
+++ b/grml-terminalserver-config
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 # Filename:      terminalserver-config
 # Purpose:       configuration program for grml-terminalserver
 # Authors:       grml-team (grml.org), (c) Michael Gebetsroither <gebi@grml.org>
@@ -124,6 +124,7 @@ function actionAutoconf
 # INITRD {{{
 function actionMkInitrd
 {
+  echo
   echo -n "Creating initrd $PATH_/minirt26.gz: "
   if isExistent "$PATH_/minirt26.gz" ; then
      echo
@@ -505,10 +506,10 @@ 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 already listed press <OK>!
+Please select the types of network cards you want to boot from.
+If your networkcard is already listed just press <OK>!
 
-WARNING: DON't add all NIC's, grub could possibly stop working!!"
+WARNING: Do NOT add all NICs, grub could possibly stop working!"
   local nics_=""
 
   if [[ $2 == "" ]]; then
@@ -521,7 +522,10 @@ WARNING: DON't add all NIC's, grub could possibly stop working!!"
     $DIALOG_ --clear --separate-output --backtitle "$BACK_TITLE_" --title "$grub_title_" --checklist \
       "$grub_nic_message_" 10 70 0 $nics_ 2>$TMP_
     local ret_=$?
-    if [[ $ret_ -ne 0 || `wc -l <$TMP_` -eq 0 ]]; then
+    if [[ $ret_ -ne 0 ]]; then
+       die "exiting as requested"
+    fi
+    if [[ `wc -l <$TMP_` -eq 0 ]]; then
       echo $ret_
       warn "you should give me your specified NICs but didn't => DEFAULT will be used"
       awk '/ on$/{print $1}' $GRUB_NIC_CONF_ >$TMP_