From 532caa54505b1ff0d9aabf32340bca90451e90c7 Mon Sep 17 00:00:00 2001
From: Pascal Rigaux <pixel@mandriva.com>
Date: Wed, 13 Feb 2002 12:58:12 +0000
Subject: (fstab_to_string): unsetting mount points in standalone will now work

---
 perl-install/fs.pm | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/perl-install/fs.pm b/perl-install/fs.pm
index e75970330..bfbdc42d9 100644
--- a/perl-install/fs.pm
+++ b/perl-install/fs.pm
@@ -139,6 +139,15 @@ sub fstab_to_string {
     my @l1 = (fsedit::get_really_all_fstab($all_hds), @{$all_hds->{special}});
     my @l2 = read_fstab($prefix, "/etc/fstab", 'all_options');
 
+    {
+	#- remove entries from @l2 that are given by @l1
+	#- this is needed to allow to unset a mount point
+	my %new; 
+	$new{$_->{device}} = 1 foreach @l1;
+	delete $new{none}; #- special case for device "none" which can be _mounted_ more than once
+	@l2 = grep { !$new{$_->{device}} } @l2;
+    }
+
     my %new;
     my @l = map { 
 	my $device = 
-- 
cgit v1.2.1