summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tv@mageia.org>2013-04-30 19:38:42 +0000
committerThierry Vignaud <tv@mageia.org>2013-04-30 19:38:42 +0000
commit905b15028880f01daf8415861f8ecb8a899a4b82 (patch)
tree6511a9c5dbfdfb8f023c0232feee9185a6f9c100
parentc653cceece468a8149a31a3b4d9e9ec8213b40aa (diff)
downloaddrakx-905b15028880f01daf8415861f8ecb8a899a4b82.tar
drakx-905b15028880f01daf8415861f8ecb8a899a4b82.tar.gz
drakx-905b15028880f01daf8415861f8ecb8a899a4b82.tar.bz2
drakx-905b15028880f01daf8415861f8ecb8a899a4b82.tar.xz
drakx-905b15028880f01daf8415861f8ecb8a899a4b82.zip
enable to abort choosing distro to rescue (mga#9765)
-rw-r--r--rescue/NEWS1
-rwxr-xr-xrescue/guessmounts6
2 files changed, 6 insertions, 1 deletions
diff --git a/rescue/NEWS b/rescue/NEWS
index e4aea9f46..22d0605e1 100644
--- a/rescue/NEWS
+++ b/rescue/NEWS
@@ -1,4 +1,5 @@
- add a script to simplfy grabbing of journal logs for bug reports
+- enable to abort choosing distro to rescue (mga#9765)
Version 1.41 - 6 April 2013 by Thierry Vignaud
diff --git a/rescue/guessmounts b/rescue/guessmounts
index eb9617e15..27b920c9d 100755
--- a/rescue/guessmounts
+++ b/rescue/guessmounts
@@ -93,13 +93,17 @@ if (@roots) {
if (@roots == 1) {
$selected = first(@roots);
} else {
- print "\n\nWhich system do you want to rescue?\n";
+ print "\n\nWhich system do you want to rescue?\n0: Abort\n";
each_index { print $::i + 1, ": $_->{pretty_name}\n" } @roots;
my $res;
while ($res < 1 || $res > @roots) {
print "what is your choice (type the number of your selection or C^c to abort)?\n";
$res = <>;
chomp($res);
+ if ($res eq "0") {
+ print "Aborting\n";
+ exit(1);
+ }
}
$selected = $roots[$res-1];
}