From 29b91486ff7de14e6f4388ee03bf426a912f76d9 Mon Sep 17 00:00:00 2001
From: Pascal Rigaux <pixel@mandriva.com>
Date: Thu, 2 Aug 2007 14:34:16 +0000
Subject: drop supermount support (it has been dropped from our kernel)

---
 perl-install/install/NEWS     | 1 +
 perl-install/install/any.pm   | 2 +-
 perl-install/install/steps.pm | 3 +--
 3 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'perl-install/install')

diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS
index 953feea1f..414819858 100644
--- a/perl-install/install/NEWS
+++ b/perl-install/install/NEWS
@@ -1,3 +1,4 @@
+- drop supermount support
 - diskdrake: drop "Rescue partition table" feature 
   (was based on rescuept which has been dropped in util-linux, but was quite
   bad compared to testdisk anyway)
diff --git a/perl-install/install/any.pm b/perl-install/install/any.pm
index 1ce4dc6d2..956f1adff 100644
--- a/perl-install/install/any.pm
+++ b/perl-install/install/any.pm
@@ -706,7 +706,7 @@ sub g_auto_install {
 	$_->{mntpoint} && fs::format::known_type($_);
     } @{$::o->{fstab}} ];
     
-    exists $::o->{$_} and $o->{$_} = $::o->{$_} foreach qw(locale authentication mouse net timezone superuser keyboard users partitioning isUpgrade manualFstab nomouseprobe crypto security security_user libsafe useSupermount autoExitInstall X services postInstall postInstallNonRooted); #- TODO modules bootloader 
+    exists $::o->{$_} and $o->{$_} = $::o->{$_} foreach qw(locale authentication mouse net timezone superuser keyboard users partitioning isUpgrade manualFstab nomouseprobe crypto security security_user libsafe autoExitInstall X services postInstall postInstallNonRooted); #- TODO modules bootloader 
 
     local $o->{partitioning}{auto_allocate} = !$b_replay;
     $o->{autoExitInstall} = !$b_replay;
diff --git a/perl-install/install/steps.pm b/perl-install/install/steps.pm
index 0da947097..beeabde1e 100644
--- a/perl-install/install/steps.pm
+++ b/perl-install/install/steps.pm
@@ -350,7 +350,7 @@ sub beforeInstallPackages {
     }
 
     if ($o->{isUpgrade} =~ /redhat|conectiva/) {
-	#- to ensure supermount is removed for cds
+	#- to ensure supermount is removed (???)
 	fs::mount_options::set_all_default($o->{all_hds}, %$o, lang::fs_options($o->{locale}));
     }
 	
@@ -826,7 +826,6 @@ sub miscellaneous {
 }
 sub miscellaneousAfter {
     my ($o) = @_;
-    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