summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2003-09-15 10:55:53 +0000
committerPascal Rigaux <pixel@mandriva.com>2003-09-15 10:55:53 +0000
commit4d906c772f0eb1c2d5f7eb6f18516ee35f756a5a (patch)
treebf5b8370b6ebea67ea10abb4eedd8a25d868a5dd
parenta3972dc7082c1e4fad7692d631783cc33a3e3db1 (diff)
downloaddrakx-backup-do-not-use-4d906c772f0eb1c2d5f7eb6f18516ee35f756a5a.tar
drakx-backup-do-not-use-4d906c772f0eb1c2d5f7eb6f18516ee35f756a5a.tar.gz
drakx-backup-do-not-use-4d906c772f0eb1c2d5f7eb6f18516ee35f756a5a.tar.bz2
drakx-backup-do-not-use-4d906c772f0eb1c2d5f7eb6f18516ee35f756a5a.tar.xz
drakx-backup-do-not-use-4d906c772f0eb1c2d5f7eb6f18516ee35f756a5a.zip
when "Back" is pressed, restore the list of entries in bootloader (bug #5680)
-rw-r--r--perl-install/any.pm10
1 files changed, 8 insertions, 2 deletions
diff --git a/perl-install/any.pm b/perl-install/any.pm
index f4f9cb485..f5dc1602a 100644
--- a/perl-install/any.pm
+++ b/perl-install/any.pm
@@ -431,7 +431,8 @@ if_(arch() !~ /sparc|ppc|ia64/,
1;
};
- $in->ask_from__add_modify_remove('',
+ my @prev_entries = @{$b->{entries}};
+ if ($in->ask_from__add_modify_remove('',
N("Here are the entries on your boot menu so far.
You can create additional entries or change the existing ones."), [ {
format => sub {
@@ -440,7 +441,12 @@ You can create additional entries or change the existing ones."), [ {
"$e->{label} ($e->{kernel_or_dev})" . ($b->{default} eq $e->{label} && " *") :
translate($e);
}, list => $b->{entries},
- } ], Add => $Add, Modify => $Modify, Remove => $Remove);
+ } ], Add => $Add, Modify => $Modify, Remove => $Remove)) {
+ 1;
+ } else {
+ @{$b->{entries}} = @prev_entries;
+ '';
+ }
}
my @etc_pass_fields = qw(name pw uid gid realname home shell);