X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=grml-terminalserver-config;h=8aa074808c56df0bc766e3fd01ba3347714743e0;hb=3c88b575a768e4274b7676442042cd9529e7fa49;hp=2cfae3f7b132ad9df110941e9a3574ea3b2c5e64;hpb=40f2a277ce367ff10e1cef3a43d6cf6f4fa9a454;p=grml-terminalserver.git

diff --git a/grml-terminalserver-config b/grml-terminalserver-config
index 2cfae3f..8aa0748 100755
--- a/grml-terminalserver-config
+++ b/grml-terminalserver-config
@@ -117,24 +117,11 @@ function actionAutoconf
 # INITRD {{{
 function actionMkInitrd
 {
-  echo
   echo "Installing initrd $PATH_/minirt26.gz:"
-  if isExistent "$PATH_/minirt26.gz" ; then
-     echo
-     echo "$PATH_/minirt26.gz exists already, nothing to do"
-     return 0
-  fi
-
   # until we have a stable file location API let's use
   # an according heuristic
-  for file in "$(find /live/image/boot -name initrd.gz)"; do
-    dir="$(dirname $file)"
-    if file "$dir"/linux26 | grep -q "$(uname -r)" ; then
-      cp "$dir"/initrd.gz "$PATH_"/minirt26.gz
-      echo '... done'
-      return 0
-    fi
-  done
+  initrd_=initrd.img-"$(uname -r)"
+  cp /boot/"$initrd_" "$PATH_"/minirt26.gz || die "Could not copy /boot/$initrd_"
 }
 
 # }}}
@@ -150,7 +137,7 @@ function actionInteractive
   local card_title_="Choose network device connected to client network"
   local card_message_="Available network devices:"
   local iprange_title_="IP Address range for clients"
-local iprange_message_="
+  local iprange_message_="
 Please enter the desired IP-Range of addresses that should be allocated by clients, separated by a single space.
 
 Example:
@@ -162,7 +149,7 @@ for addresses from 192.168.0.101 to (and including) 192.168.0.200.
   local runconfig_title_="Networkcard config"
   local runconfig_message_="Would you like to configure your interfaces now?"
 
-  # on witch interfaces should we listen
+  # on which interfaces should we listen
   local netdevices_="$(grep -ve 'lo:' -ve 'Inter-|' -ve 'face |bytes' /proc/net/dev | awk -F: '{print $1}')"
   local device_list_=""
   for INTERFACE_ in $netdevices_; do device_list_="$device_list_ ${INTERFACE_} Networkcard_${INTERFACE_##eth}"; done