From 2834ce658055f5e4bd65726600aa50f747e1f867 Mon Sep 17 00:00:00 2001
From: Pascal Rigaux <pixel@mandriva.com>
Date: Fri, 30 Jan 2004 15:40:24 +0000
Subject: *** empty log message ***

---
 perl-install/fs.pm            | 2 +-
 perl-install/install_steps.pm | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'perl-install')

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