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

diff --git a/grml-terminalserver-config b/grml-terminalserver-config
index 0d7c992..e5ade48 100755
--- a/grml-terminalserver-config
+++ b/grml-terminalserver-config
@@ -1,10 +1,9 @@
-#!/bin/sh
+#!/bin/bash
 # Filename:      terminalserver-config
 # Purpose:       configuration program for grml-terminalserver
 # Authors:       grml-team (grml.org), (c) Michael Gebetsroither <gebi@grml.org>
 # Bug-Reports:   see http://grml.org/bugs/
 # License:       This file is licensed under the GPL v2.
-# Latest change: Son Jän 20 12:12:44 CET 2008 [mika]
 ################################################################################
 
 
@@ -124,7 +123,8 @@ function actionAutoconf
 # INITRD {{{
 function actionMkInitrd
 {
-  echo -n "Creating initrd $PATH_/minirt26.gz: "
+  echo
+  echo "Creating initrd $PATH_/minirt26.gz:"
   if isExistent "$PATH_/minirt26.gz" ; then
      echo
      echo "$PATH_/minirt26.gz exists already, skipping initrd creation"
@@ -136,7 +136,7 @@ function actionMkInitrd
   else
     mkInitrd
   fi
-  echo done
+  echo '... done'
 }
 
 function mkInitrdNew
@@ -447,7 +447,7 @@ function optGrml2Hd
   local options_='BOOT_IMAGE=grml2hd'
 
   # get partition to install grml2hd on
-  OPTIONS_PARTITION_MSG_='Please give me the target partition where to install grml'
+  OPTIONS_PARTITION_MSG_='Please specify the target partition where to install grml'
   PARTITION_TITLE_='Partition selection'
   echo -n "" >"$TMP_"
   $DIALOG_ --clear --backtitle "$BACK_TITLE_" --title "$PARTITION_TITLE_" --inputbox \
@@ -456,7 +456,7 @@ function optGrml2Hd
   options_="$options_ $tmp_"
 
   # get filesystem type
-  OPTION_FS_TYPE_='Please give me the filesystem type'
+  OPTION_FS_TYPE_='Please specify the filesystem type'
   FS_TITLE_='Filesystem selection'
   echo -n "" >"$TMP_"
   $DIALOG_ --clear --backtitle "$BACK_TITLE_" --title "$FS_TITLE_" --inputbox \
@@ -465,7 +465,7 @@ function optGrml2Hd
   options_="$options_ $tmp_"
 
   # get where to save mbr
-  OPTION_MBR_='Please give me the location where to save the mbr'
+  OPTION_MBR_='Please specify the location where to save the mbr'
   MBR_TITLE_='Select location of mbr'
   echo -n "" >"$TMP_"
   $DIALOG_ --clear --backtitle "$BACK_TITLE_" --title "$MBR_TITLE_" --inputbox \
@@ -505,10 +505,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,9 +521,12 @@ 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"
+      warn "you should specify the NICs but didn't => DEFAULT will be used"
       awk '/ on$/{print $1}' $GRUB_NIC_CONF_ >$TMP_
     fi
   else
@@ -536,6 +539,7 @@ WARNING: DON't add all NIC's, grub could possibly stop working!!"
   echo "\"$cmd_line_\""
 
   execute "tar xzf $GRUB_SOURCE_ -C $tmp_" warn || return 1
+  local_dir="$(pwd)"
   execute "cd $tmp_/grub*" warn || return 1
 cat >preset-menu <<EOT
 # Set up the serial terminal, first of all.
@@ -569,6 +573,8 @@ EOT
 
   execute "cat $st1_ $st2_ > $PATH_/grub.img" warn || return 1
 
+  cd "$local_dir"
+
   return 0
 }
 
@@ -576,7 +582,7 @@ function grubWrite
 {
   local grub_title_="Grub configuration"
   $DIALOG_ --clear --backtitle "$BACK_TITLE_" --title "$grub_title_" --yesno \
-    "Do you want to write your grub image to /dev/fd0" 5 75 || return 1
+    "Do you want to write the grub image to /dev/fd0" 5 75 || return 1
 
   execute "dd if=$PATH_/grub.img of=/dev/fd0" warn || return 0
   return 1
@@ -586,7 +592,7 @@ function grubMultiWrite
 {
   local target_=${1:-'/dev/fd0'}
 
-  isExistent "$PATH_/grub.img" die "you must give me an image or run \"$PROG_NAME__ grubconf\""
+  isExistent "$PATH_/grub.img" die "you have to specify an image or run \"$PROG_NAME__ grubconf\""
   isExistent "$target_" die "$target_ is not a valied"
   while true; do
     echo -n "Please insert disk into $target_ and press <ENTER> (STRG-C for end)"