drakupdate_fstab: remove --no-flag option, the "kudzu" option has not been written for ages

3 files changed, 5 insertions, 15 deletions

diff --git a/perl-install/NEWS b/perl-install/NEWS
index 62f9309d4..d164ed766 100644
--- a/perl-install/NEWS
+++ b/perl-install/NEWS
@@ -6,6 +6,7 @@
   o check that media are not USB keys before auto-configuring them (#34568)
 - drakupdate_fstab:
   o never set "sync" option, use default fs options from drakx (#35204)
+  o remove --no-flag option, the "kudzu" option has not been written for ages
 - drakbug:
   o report crash messages in the bug report only when --incident is used
     (and not when tools explicitely run drakbug with --report)
diff --git a/perl-install/harddrake/data.pm b/perl-install/harddrake/data.pm
index d4e8d2ee2..361972033 100644
--- a/perl-install/harddrake/data.pm
+++ b/perl-install/harddrake/data.pm
@@ -46,12 +46,12 @@ sub set_removable_configurator {
 
 sub set_media_auto_configurator {
     my ($device) = @_;
-    return "/usr/sbin/drakupdate_fstab --no-flag --auto --add $device->{device}" if is_auto_configurable_media($device);
+    return "/usr/sbin/drakupdate_fstab --auto --add $device->{device}" if is_auto_configurable_media($device);
 }
 
 sub set_media_remover {
     my ($device) = @_;
-    return "/usr/sbin/drakupdate_fstab --no-flag --del $device->{device}" if is_auto_configurable_media($device);
+    return "/usr/sbin/drakupdate_fstab --del $device->{device}" if is_auto_configurable_media($device);
 }
 
 my $modules_conf = modules::any_conf->read;
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);