X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=grml-terminalserver-config;h=515e1181842cbea42ac22b707f98e3edeb7267d1;hb=bb865cdc662f3120bda5a19b1b097b4bfcfbc1f6;hp=c9920adcaa65777976b44095261a3432768b15dc;hpb=c635641cb4de0af5ecfd94862ee85c87e34fe07a;p=grml-terminalserver.git

diff --git a/grml-terminalserver-config b/grml-terminalserver-config
index c9920ad..515e118 100755
--- a/grml-terminalserver-config
+++ b/grml-terminalserver-config
@@ -1,10 +1,10 @@
-#!/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: Die Mär 27 13:34:47 CEST 2007 [mika]
+# Latest change: Son Jän 20 12:12:44 CET 2008 [mika]
 ################################################################################
 
 
@@ -125,7 +125,12 @@ function actionAutoconf
 function actionMkInitrd
 {
   echo -n "Creating initrd $PATH_/minirt26.gz: "
-  isExistent "$PATH_/minirt26.gz" && echo && echo "$PATH_/minirt26.gz exists already, skipping initrd creation" && return 0
+  if isExistent "$PATH_/minirt26.gz" ; then
+     echo
+     echo "$PATH_/minirt26.gz exists already, skipping initrd creation"
+     return 0
+  fi
+
   if [ -e '/live/cow' ]; then
     mkInitrdNew
   else
@@ -141,7 +146,7 @@ function mkInitrdNew
   local tmp_="`mktemp -t terminalserver__initramfsbk.XXXXXX`"
   cp $cfg_ $tmp_
   sed -i 's/^MODULES=.*/MODULES=netboot/' $cfg_
-  update-initramfs -u -t
+  update-initramfs -u -t 1>/dev/null
   mv $tmp_ $cfg_
 
   local initrd_="/boot/initrd.img-$KERNEL_VERSION_"
@@ -500,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
@@ -558,8 +563,12 @@ EOT
   isExistent $st1_ warn || return 1
   isExistent $st2_ warn || return 1
 
-  execute "mv -fb $PATH_/grub.img $PATH_/grub.img.old"
+  if [ -r "$PATH_/grub.img" ] ; then
+     execute "mv -fb $PATH_/grub.img $PATH_/grub.img.old"
+  fi
+
   execute "cat $st1_ $st2_ > $PATH_/grub.img" warn || return 1
+
   return 0
 }