summaryrefslogtreecommitdiffstats
path: root/perl-install/standalone
diff options
context:
space:
mode:
authorOlivier Blin <oblin@mandriva.com>2008-01-02 18:17:50 +0000
committerOlivier Blin <oblin@mandriva.com>2008-01-02 18:17:50 +0000
commita45e6b68b89ae7485903eadb8928bcdfe900e35e (patch)
tree33090adada0580402737522bbfb649cf7f36a284 /perl-install/standalone
parent12ab9d6b03cfe4c5adeed6fb6bfba8c695f6c6a6 (diff)
downloaddrakx-a45e6b68b89ae7485903eadb8928bcdfe900e35e.tar
drakx-a45e6b68b89ae7485903eadb8928bcdfe900e35e.tar.gz
drakx-a45e6b68b89ae7485903eadb8928bcdfe900e35e.tar.bz2
drakx-a45e6b68b89ae7485903eadb8928bcdfe900e35e.tar.xz
drakx-a45e6b68b89ae7485903eadb8928bcdfe900e35e.zip
drakupdate_fstab: remove --no-flag option, the "kudzu" option has not been written for ages
Diffstat (limited to 'perl-install/standalone')
-rwxr-xr-xperl-install/standalone/drakupdate_fstab15
1 files changed, 2 insertions, 13 deletions
diff --git a/perl-install/standalone/drakupdate_fstab b/perl-install/standalone/drakupdate_fstab
index 926374f13..5c615f726 100755
--- a/perl-install/standalone/drakupdate_fstab
+++ b/perl-install/standalone/drakupdate_fstab
@@ -31,12 +31,11 @@ $::isStandalone = 1; #- not using standalone.pm which generates too many logs fo
log::l("drakupdate_fstab called with @ARGV\n");
-my ($no_flag, $debug, $removed);
+my ($debug, $removed);
my %args = (
'--auto' => \$::auto,
'--debug' => \$debug,
- '--no-flag' => \$no_flag,
'--test' => \$::testing,
);
@@ -51,7 +50,7 @@ each_index {
my ($raw_action, $device_name) = @ARGV;
my ($action) = $raw_action =~ /^--(add|del)/;
-@ARGV == 2 && $action or die "usage: drakupdate_fstab [--test] [--auto] [--no-flag] [--add | --del] <device>\n";
+@ARGV == 2 && $action or die "usage: drakupdate_fstab [--test] [--auto] [--add | --del] <device>\n";
main($action, $device_name);
@@ -85,10 +84,6 @@ sub set_options {
fs::mount_options::set_default($part,
security => security::level::get(),
lang::fs_options(lang::read()));
-
- my ($options, $unknown) = fs::mount_options::unpack($part);
- $options->{kudzu} = 1 if !$no_flag;
- fs::mount_options::pack($part, $options, $unknown);
}
sub set_mount_point {
@@ -158,12 +153,6 @@ sub configure_part {
print STDERR "Not found in fstab\n" if $::testing;
return;
}
- foreach (@$existing_fstab_entries) {
- if (!$no_flag && $_->{options} !~ /\bkudzu\b/) {
- print STDERR "Not a 'kudzu'-flagged entry\n" if $::testing;
- return;
- }
- }
my ($s) = fs::prepare_write_fstab($fstab_, '', 'keep_smb_credentials');
output($fstab_file, $s);