diff options
author | Pascal Rigaux <pixel@mandriva.com> | 2002-02-13 12:58:12 +0000 |
---|---|---|
committer | Pascal Rigaux <pixel@mandriva.com> | 2002-02-13 12:58:12 +0000 |
commit | 532caa54505b1ff0d9aabf32340bca90451e90c7 (patch) | |
tree | 14391fc9460c4912703836d61d7ffb076e90b5c9 | |
parent | ccd328a91005d8942f6afb74880e018636ba573c (diff) | |
download | drakx-532caa54505b1ff0d9aabf32340bca90451e90c7.tar drakx-532caa54505b1ff0d9aabf32340bca90451e90c7.tar.gz drakx-532caa54505b1ff0d9aabf32340bca90451e90c7.tar.bz2 drakx-532caa54505b1ff0d9aabf32340bca90451e90c7.tar.xz drakx-532caa54505b1ff0d9aabf32340bca90451e90c7.zip |
(fstab_to_string): unsetting mount points in standalone will now work
-rw-r--r-- | perl-install/fs.pm | 9 |
1 files changed, 9 insertions, 0 deletions
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 = |