-#!/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]
################################################################################
# INITRD {{{
function actionMkInitrd
{
+ echo
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
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_"
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
$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_
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
}