summaryrefslogtreecommitdiffstats
path: root/perl-install/standalone
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2007-08-02 14:34:16 +0000
committerPascal Rigaux <pixel@mandriva.com>2007-08-02 14:34:16 +0000
commit29b91486ff7de14e6f4388ee03bf426a912f76d9 (patch)
tree974112bd10718488c55b5cd93a22a5b5c66475db /perl-install/standalone
parent076d81eaaea229d7e0885113e008eb04fdf8591f (diff)
downloaddrakx-29b91486ff7de14e6f4388ee03bf426a912f76d9.tar
drakx-29b91486ff7de14e6f4388ee03bf426a912f76d9.tar.gz
drakx-29b91486ff7de14e6f4388ee03bf426a912f76d9.tar.bz2
drakx-29b91486ff7de14e6f4388ee03bf426a912f76d9.tar.xz
drakx-29b91486ff7de14e6f4388ee03bf426a912f76d9.zip
drop supermount support (it has been dropped from our kernel)
Diffstat (limited to 'perl-install/standalone')
-rwxr-xr-xperl-install/standalone/diskdrake2
-rwxr-xr-xperl-install/standalone/drakupdate_fstab8
2 files changed, 3 insertions, 7 deletions
diff --git a/perl-install/standalone/diskdrake b/perl-install/standalone/diskdrake
index a1c09ccd0..97564e3e0 100755
--- a/perl-install/standalone/diskdrake
+++ b/perl-install/standalone/diskdrake
@@ -102,11 +102,9 @@ if ($type eq 'list-hd') {
$raw_hd->{mntpoint} ||= find { !fs::get::has_mntpoint($_, $all_hds) } map { "/media/$mntpoint$_" } '', 2 .. 10;
$raw_hd->{is_removable} = 1; #- force removable flag
- my $useSupermount = 'magicdev';
require security::level;
require lang;
fs::mount_options::set_default($raw_hd,
- useSupermount => $useSupermount,
security => security::level::get(),
lang::fs_options(lang::read()));
}
diff --git a/perl-install/standalone/drakupdate_fstab b/perl-install/standalone/drakupdate_fstab
index 4d48ef1f1..cbc182c5c 100755
--- a/perl-install/standalone/drakupdate_fstab
+++ b/perl-install/standalone/drakupdate_fstab
@@ -93,11 +93,10 @@ sub device_name_to_entry {
}
sub set_options {
- my ($part, $useSupermount, $o_sync) = @_;
+ my ($part, $o_sync) = @_;
$part->{is_removable} = 1; #- force removable flag
fs::mount_options::set_default($part,
- useSupermount => $useSupermount,
security => security::level::get(),
lang::fs_options(lang::read()));
@@ -151,8 +150,7 @@ sub main {
return;
}
my %dynamic = getVarsFromSh('/etc/sysconfig/dynamic');
- my $useSupermount = $dynamic{SUPERMOUNT} eq 'yes' ? 'magicdev' : '';
- set_options($part, $useSupermount, to_bool($dynamic{SYNC} ne 'no'));
+ set_options($part, to_bool($dynamic{SYNC} ne 'no'));
set_mount_point($part, $fstab) or return;
my ($line) = fs::prepare_write_fstab([$part]);
@@ -162,7 +160,7 @@ sub main {
}
if ($::auto) {
- print $part->{mntpoint}, " ", $useSupermount ? 'supermount' : 'user', "\n";
+ print $part->{mntpoint}, " user\n";
}
} else {
if (!@$existing_fstab_entries) {