summaryrefslogtreecommitdiffstats
path: root/perl-install/standalone/drakupdate_fstab
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2003-04-17 11:34:32 +0000
committerPascal Rigaux <pixel@mandriva.com>2003-04-17 11:34:32 +0000
commit4781e491c32fdfe0dbe3cf97a8aca90040a9406b (patch)
treeca4f166763cc8be7bc01e943dcbf5a058758060d /perl-install/standalone/drakupdate_fstab
parent5458ef92ec80fab427e4d69b5cdd22bb76b261d8 (diff)
downloaddrakx-backup-do-not-use-4781e491c32fdfe0dbe3cf97a8aca90040a9406b.tar
drakx-backup-do-not-use-4781e491c32fdfe0dbe3cf97a8aca90040a9406b.tar.gz
drakx-backup-do-not-use-4781e491c32fdfe0dbe3cf97a8aca90040a9406b.tar.bz2
drakx-backup-do-not-use-4781e491c32fdfe0dbe3cf97a8aca90040a9406b.tar.xz
drakx-backup-do-not-use-4781e491c32fdfe0dbe3cf97a8aca90040a9406b.zip
new perl_checker compliance
Diffstat (limited to 'perl-install/standalone/drakupdate_fstab')
-rwxr-xr-xperl-install/standalone/drakupdate_fstab16
1 files changed, 9 insertions, 7 deletions
diff --git a/perl-install/standalone/drakupdate_fstab b/perl-install/standalone/drakupdate_fstab
index 94f1a5d54..aee783cd6 100755
--- a/perl-install/standalone/drakupdate_fstab
+++ b/perl-install/standalone/drakupdate_fstab
@@ -79,11 +79,13 @@ sub device_name_to_entry {
}
sub set_options {
- my ($part, $use_supermount) = @_;
- my $security = security::level::get();
- my ($iocharset, $codepage) = lang::fs_options(lang::read());
+ my ($part, $useSupermount) = @_;
- fs::set_default_options($part, 1, $use_supermount, $security, $iocharset, $codepage);
+ fs::set_default_options($part,
+ is_removable => 1,
+ useSupermount => $useSupermount,
+ security => security::level::get(),
+ lang::fs_options(lang::read()));
my ($options, $unknown) = fs::mount_options_unpack($part);
$options->{kudzu} = 1 if !$no_flag;
@@ -128,15 +130,15 @@ sub main {
print STDERR "Already in fstab\n" if $::testing;
return;
}
- my $use_supermount = 0; #- force non-supermount, supermount is too buggy
- set_options($part, $use_supermount);
+ my $useSupermount = 0; #- force non-supermount, supermount is too buggy
+ set_options($part, $useSupermount);
set_mount_point($part, $fstab) or return;
my ($line) = fs::prepare_write_fstab([$part]);
append_to_file($fstab_file, $line) if $line;
if ($::auto) {
- print $part->{mntpoint}, " ", $use_supermount ? 'supermount' : 'user', "\n";
+ print $part->{mntpoint}, " ", $useSupermount ? 'supermount' : 'user', "\n";
}
} else {
if (!@$existing_fstab_entries) {