summaryrefslogtreecommitdiffstats
path: root/perl-install
diff options
context:
space:
mode:
authorThierry Vignaud <thierry.vignaud@gmail.com>2014-03-14 08:36:41 +0100
committerThierry Vignaud <thierry.vignaud@gmail.com>2014-03-14 08:37:36 +0100
commit234189fa092bad5b62ba2bba6d67be152720657d (patch)
treefe756b35064aba808e000115365ea2b6165e7d78 /perl-install
parent3546b50afc6f78bda9384ed858ef7ea503ddafd0 (diff)
downloaddrakx-234189fa092bad5b62ba2bba6d67be152720657d.tar
drakx-234189fa092bad5b62ba2bba6d67be152720657d.tar.gz
drakx-234189fa092bad5b62ba2bba6d67be152720657d.tar.bz2
drakx-234189fa092bad5b62ba2bba6d67be152720657d.tar.xz
drakx-234189fa092bad5b62ba2bba6d67be152720657d.zip
drop disabling supermount
supermount is dead since 2007 (commit 29b91486ff7de14e6f4388ee03bf426a912f76d9)
Diffstat (limited to 'perl-install')
-rw-r--r--perl-install/fs.pm21
-rw-r--r--perl-install/fs/mount_options.pm1
-rw-r--r--perl-install/modules/any_conf.pm5
3 files changed, 1 insertions, 26 deletions
diff --git a/perl-install/fs.pm b/perl-install/fs.pm
index d4f742da6..f8b02c9c7 100644
--- a/perl-install/fs.pm
+++ b/perl-install/fs.pm
@@ -49,27 +49,6 @@ sub read_fstab {
$options = 'defaults' if $options eq 'rw'; # clean-up for mtab read
- if ($fs_type eq 'supermount') {
- log::l("dropping supermount");
- $options = join(",", grep {
- if (/fs=(.*)/) {
- $fs_type = $1;
-
- #- with supermount, the type could be something like ext2:vfat
- #- but this cannot be done without supermount, so switching to "auto"
- $fs_type = 'auto' if $fs_type =~ /:/;
-
- 0;
- } elsif (/dev=(.*)/) {
- $dev = $1;
- 0;
- } elsif ($_ eq '--') {
- 0;
- } else {
- 1;
- }
- } split(',', $options));
- }
s/\\040/ /g foreach $mntpoint, $dev, $options;
if ($fs_type eq 'ext4') {
diff --git a/perl-install/fs/mount_options.pm b/perl-install/fs/mount_options.pm
index 38b8077fe..04362fb8c 100644
--- a/perl-install/fs/mount_options.pm
+++ b/perl-install/fs/mount_options.pm
@@ -187,7 +187,6 @@ sub set_default {
if (!$opts{ignore_is_removable} && $part->{is_removable}
&& !member($part->{mntpoint}, fs::type::directories_needed_to_boot())
&& (!$part->{fs_type} || $part->{fs_type} eq 'auto' || $part->{fs_type} =~ /:/)) {
- $options->{supermount} = 0; #- always disable supermount
$part->{fs_type} = 'auto';
$options->{flush} = 1 if $part->{media_type} ne 'cdrom';
}
diff --git a/perl-install/modules/any_conf.pm b/perl-install/modules/any_conf.pm
index 3873955b3..9f607dbe8 100644
--- a/perl-install/modules/any_conf.pm
+++ b/perl-install/modules/any_conf.pm
@@ -139,10 +139,7 @@ sub write {
#- Substitute new config (if config has changed)
substInFile {
my ($type, $module, $val) = split(' ', chomp_($_), 3);
- if ($type eq 'post-install' && $module eq 'supermount') {
- #- remove the post-install supermount stuff.
- $_ = '';
- } elsif (member($type, $conf->handled_fields)) {
+ if (member($type, $conf->handled_fields)) {
my $new_val = $conf->{$module}{$type};
if (!$new_val) {
$_ = '';