From fd1545140fbdcf0a4f640ff4aab296b32e93d931 Mon Sep 17 00:00:00 2001 From: Michael Prokop Date: Sat, 16 May 2009 21:13:13 +0200 Subject: [PATCH] grml-terminalserver-config: exit script if user selects cancel option --- debian/changelog | 4 +++- grml-terminalserver-config | 5 ++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index a180f23..301d15f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,8 +2,10 @@ grml-terminalserver (0.99.3) unstable; urgency=low * grml-terminalserver-config: improve wording of grub's network boot selection dialog. + * grml-terminalserver-config: exit script if user selects + 'Cancel' in grub's network boot selection dialog. - -- Michael Prokop Sat, 16 May 2009 21:03:19 +0200 + -- Michael Prokop Sat, 16 May 2009 21:12:10 +0200 grml-terminalserver (0.99.2) unstable; urgency=low diff --git a/grml-terminalserver-config b/grml-terminalserver-config index 515e118..cdc6c39 100755 --- a/grml-terminalserver-config +++ b/grml-terminalserver-config @@ -521,7 +521,10 @@ WARNING: Do NOT add all NICs, 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" awk '/ on$/{print $1}' $GRUB_NIC_CONF_ >$TMP_ -- 2.1.4