From 3606726bf29e04a97bac0dd54dc57479c380bf29 Mon Sep 17 00:00:00 2001
From: Thierry Vignaud <tv@mageia.org>
Date: Tue, 30 Apr 2013 19:38:42 +0000
Subject: enable to abort choosing distro to rescue (mga#9765)

---
 rescue/NEWS        | 1 +
 rescue/guessmounts | 6 +++++-
 2 files changed, 6 insertions(+), 1 deletion(-)

(limited to 'rescue')

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];
     }
-- 
cgit v1.2.1