projects
/
grml-terminalserver.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
add additional newline in front so text doesn't appear inside dialog's output
[grml-terminalserver.git]
/
grml-terminalserver-config
diff --git
a/grml-terminalserver-config
b/grml-terminalserver-config
index
9d9ed14
..
a1c9db1
100755
(executable)
--- a/
grml-terminalserver-config
+++ b/
grml-terminalserver-config
@@
-124,6
+124,7
@@
function actionAutoconf
# INITRD {{{
function actionMkInitrd
{
# INITRD {{{
function actionMkInitrd
{
+ echo
echo -n "Creating initrd $PATH_/minirt26.gz: "
if isExistent "$PATH_/minirt26.gz" ; then
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_="
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 you
r networkcard is already listed just
press <OK>!
-WARNING: D
ON't add all NIC's, grub could possibly stop working!
!"
+WARNING: D
o NOT add all NICs, grub could possibly stop working
!"
local nics_=""
if [[ $2 == "" ]]; then
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_=$?
$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_
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_