summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2004-04-27 09:59:36 +0000
committerPascal Rigaux <pixel@mandriva.com>2004-04-27 09:59:36 +0000
commit57fca3088390e3f61ebafb46aff0e3f865a97060 (patch)
treedc63d9ee2b7aef8a12b1966621f62e129475de00
parent83b3fd4dd01147c7c83ba5f8251ea886e14cbaf7 (diff)
downloaddrakx-backup-do-not-use-57fca3088390e3f61ebafb46aff0e3f865a97060.tar
drakx-backup-do-not-use-57fca3088390e3f61ebafb46aff0e3f865a97060.tar.gz
drakx-backup-do-not-use-57fca3088390e3f61ebafb46aff0e3f865a97060.tar.bz2
drakx-backup-do-not-use-57fca3088390e3f61ebafb46aff0e3f865a97060.tar.xz
drakx-backup-do-not-use-57fca3088390e3f61ebafb46aff0e3f865a97060.zip
revert handling --auto for removable, it is much better done in a separate function
(the goal of this --auto is not clear at all, and is better explicitly done)
-rw-r--r--perl-install/diskdrake/interactive.pm2
-rw-r--r--perl-install/diskdrake/removable.pm14
2 files changed, 6 insertions, 10 deletions
diff --git a/perl-install/diskdrake/interactive.pm b/perl-install/diskdrake/interactive.pm
index dbb44961d..a037c4fe4 100644
--- a/perl-install/diskdrake/interactive.pm
+++ b/perl-install/diskdrake/interactive.pm
@@ -267,7 +267,7 @@ sub Done {
}
if (!$::isInstall) {
my $new = fs::fstab_to_string($all_hds);
- if ($new ne $all_hds->{current_fstab} && ($::auto || $in->ask_yesorno('', N("Do you want to save /etc/fstab modifications"), 1))) {
+ if ($new ne $all_hds->{current_fstab} && $in->ask_yesorno('', N("Do you want to save /etc/fstab modifications"), 1)) {
$all_hds->{current_fstab} = $new;
fs::write_fstab($all_hds);
}
diff --git a/perl-install/diskdrake/removable.pm b/perl-install/diskdrake/removable.pm
index 75055a7f0..6862225c5 100644
--- a/perl-install/diskdrake/removable.pm
+++ b/perl-install/diskdrake/removable.pm
@@ -11,15 +11,11 @@ sub main {
my ($in, $all_hds, $raw_hd) = @_;
my %actions = my @actions = actions();
my $action;
- if ($::auto) {
- $actions{Done}->($in, $raw_hd, $all_hds);
- } else {
- while ($action ne 'Done') {
- $action = $in->ask_from_list_('',
- diskdrake::interactive::format_raw_hd_info($raw_hd),
- [ map { $_->[0] } group_by2 @actions ], 'Done') or return;
- $actions{$action}->($in, $raw_hd, $all_hds);
- }
+ while ($action ne 'Done') {
+ $action = $in->ask_from_list_('',
+ diskdrake::interactive::format_raw_hd_info($raw_hd),
+ [ map { $_->[0] } group_by2 @actions ], 'Done') or return;
+ $actions{$action}->($in, $raw_hd, $all_hds);
}
}