diff options
| author | Pascal Rigaux <pixel@mandriva.com> | 2004-01-30 15:40:24 +0000 |
|---|---|---|
| committer | Pascal Rigaux <pixel@mandriva.com> | 2004-01-30 15:40:24 +0000 |
| commit | 2834ce658055f5e4bd65726600aa50f747e1f867 (patch) | |
| tree | ff356564bdcbb6970f8db258b4d7a4dcf2568f97 | |
| parent | ebaebfea9131996ab40428b27b6f7415aa9ff309 (diff) | |
| download | drakx-backup-do-not-use-2834ce658055f5e4bd65726600aa50f747e1f867.tar drakx-backup-do-not-use-2834ce658055f5e4bd65726600aa50f747e1f867.tar.gz drakx-backup-do-not-use-2834ce658055f5e4bd65726600aa50f747e1f867.tar.bz2 drakx-backup-do-not-use-2834ce658055f5e4bd65726600aa50f747e1f867.tar.xz drakx-backup-do-not-use-2834ce658055f5e4bd65726600aa50f747e1f867.zip | |
*** empty log message ***
| -rw-r--r-- | perl-install/fs.pm | 2 | ||||
| -rw-r--r-- | perl-install/install_steps.pm | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/perl-install/fs.pm b/perl-install/fs.pm index 4692e3ead..1a0ec795f 100644 --- a/perl-install/fs.pm +++ b/perl-install/fs.pm @@ -438,7 +438,7 @@ sub set_default_options { my ($options, $unknown) = mount_options_unpack($part); if ($opts{is_removable}) { - $options->{supermount} = $opts{useSupermount}; + $options->{supermount} = $opts{useSupermount} && !($opts{useSupermount} eq 'magicdev' && $part->{media_type} eq 'cdrom'); $part->{type} = !$options->{supermount} ? 'auto' : $part->{media_type} eq 'cdrom' ? 'udf:iso9660' : 'ext2:vfat'; } diff --git a/perl-install/install_steps.pm b/perl-install/install_steps.pm index b61623018..f89b82f47 100644 --- a/perl-install/install_steps.pm +++ b/perl-install/install_steps.pm @@ -930,7 +930,7 @@ sub miscellaneous { } sub miscellaneousAfter { my ($o) = @_; - add2hash_ $o, { useSupermount => $o->{security} < 4 }; + add2hash_ $o, { useSupermount => $o->{security} < 4 ? 'magicdev' : 0 }; $ENV{SECURE_LEVEL} = $o->{security}; #- deprecated with chkconfig 1.3.4-2mdk, uses /etc/sysconfig/msec |