summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2005-03-31 13:54:39 +0000
committerPascal Rigaux <pixel@mandriva.com>2005-03-31 13:54:39 +0000
commit383231ef51aea1d4674aabe14768c4106461e6c4 (patch)
tree2ab9aa43c3ad7817216c1ac6f4ad8654c0a7cf0d
parentc368441200c564f664efed9e83d43f95d168baf3 (diff)
downloaddrakx-383231ef51aea1d4674aabe14768c4106461e6c4.tar
drakx-383231ef51aea1d4674aabe14768c4106461e6c4.tar.gz
drakx-383231ef51aea1d4674aabe14768c4106461e6c4.tar.bz2
drakx-383231ef51aea1d4674aabe14768c4106461e6c4.tar.xz
drakx-383231ef51aea1d4674aabe14768c4106461e6c4.zip
useSupermount is no more a boolean, don't let the "More" dialog box set it to 1 when it is magicdev
-rw-r--r--perl-install/diskdrake/interactive.pm12
1 files changed, 10 insertions, 2 deletions
diff --git a/perl-install/diskdrake/interactive.pm b/perl-install/diskdrake/interactive.pm
index c974444d2..7e8705ff6 100644
--- a/perl-install/diskdrake/interactive.pm
+++ b/perl-install/diskdrake/interactive.pm
@@ -353,6 +353,12 @@ sub Auto_allocate {
sub More {
my ($in, $hd) = @_;
+ my %automounting = (
+ 0 => N("No supermount"),
+ 1 => N("Supermount"),
+ magicdev => N("Supermount except for CDROM drives"),
+ );
+
my $r;
$in->ask_from('', '',
[
@@ -361,8 +367,10 @@ sub More {
{ val => N("Rescue partition table"), clicked_may_quit => sub { Rescuept($in, $hd); 1 } },
if_($::isInstall,
{ val => N("Reload partition table"), clicked_may_quit => sub { $r = 'force_reload'; 1 } }),
- if_($::isInstall,
- { text => N("Removable media automounting"), val => \$::o->{useSupermount}, type => 'bool' },
+ if_($::isInstall || 1,
+ { label => N("Removable media automounting"), val => \$::o->{useSupermount},
+ format => sub { $automounting{$_[0]} },
+ list => [ 0, 'magicdev', 1 ], advanced => 1 },
),
],
) && $r;