diff options
| -rw-r--r-- | perl-install/NEWS | 3 | ||||
| -rwxr-xr-x | perl-install/standalone/drakupdate_fstab | 9 |
2 files changed, 8 insertions, 4 deletions
diff --git a/perl-install/NEWS b/perl-install/NEWS index cd922eb71..cc323d9f6 100644 --- a/perl-install/NEWS +++ b/perl-install/NEWS @@ -8,6 +8,9 @@ - harddrake: o recommend using insensitive search (#39136) o notify at X11 startup when we switched to free video driver (#39164) +- drakupdate_fstab: + o do not print added/removed mountpoints with --auto (when run from + harddrake, like in Mandriva One), but add a --verbose option instead Version 10.18 - 21 March 2008 diff --git a/perl-install/standalone/drakupdate_fstab b/perl-install/standalone/drakupdate_fstab index 22df9e116..051c706d6 100755 --- a/perl-install/standalone/drakupdate_fstab +++ b/perl-install/standalone/drakupdate_fstab @@ -31,12 +31,13 @@ $::isStandalone = 1; #- not using standalone.pm which generates too many logs fo log::l("drakupdate_fstab called with @ARGV\n"); -my ($debug, $removed); +my ($debug, $verbose, $removed); my %args = ( '--auto' => \$::auto, '--debug' => \$debug, '--test' => \$::testing, + '--verbose' => \$verbose, ); each_index { @@ -50,7 +51,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] [--add | --del] <device>\n"; +@ARGV == 2 && $action or die "usage: drakupdate_fstab [--test] [--verbose] [--auto] [--add | --del] <device>\n"; main($action, $device_name); @@ -145,7 +146,7 @@ sub configure_part { system("mount $part->{mntpoint}") if !$::testing && ($device_name =~ /^fd\d+/ || $is_hd); } - if ($::auto) { + if ($verbose) { print $part->{mntpoint}, " user\n"; } } else { @@ -157,7 +158,7 @@ sub configure_part { my ($s) = fs::prepare_write_fstab($fstab_, '', 'keep_smb_credentials'); output($fstab_file, $s); - if ($::auto) { + if ($verbose) { print "$_->{mntpoint}\n" foreach @$existing_fstab_entries; } } |