diff options
Diffstat (limited to 'perl-install/standalone/drakupdate_fstab')
| -rwxr-xr-x | perl-install/standalone/drakupdate_fstab | 38 |
1 files changed, 11 insertions, 27 deletions
diff --git a/perl-install/standalone/drakupdate_fstab b/perl-install/standalone/drakupdate_fstab index 62db7b691..edb3a5663 100755 --- a/perl-install/standalone/drakupdate_fstab +++ b/perl-install/standalone/drakupdate_fstab @@ -1,7 +1,7 @@ #!/usr/bin/perl # drakupdate_fstab -# Copyright (C) 2002-2006 Mandriva (pixel@mandrakesoft.com) +# Copyright (C) 2002-2008 Mandriva (pixel) # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -31,13 +31,13 @@ $::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, $verbose, $removed); my %args = ( '--auto' => \$::auto, '--debug' => \$debug, - '--no-flag' => \$no_flag, '--test' => \$::testing, + '--verbose' => \$verbose, ); each_index { @@ -51,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] [--no-flag] [--add | --del] <device>\n"; +@ARGV == 2 && $action or die "usage: drakupdate_fstab [--test] [--verbose] [--auto] [--add | --del] <device>\n"; main($action, $device_name); @@ -79,17 +79,8 @@ sub device_name_to_entry { } sub set_options { - my ($part, $o_sync) = @_; - - $part->{is_removable} = 1; #- force removable flag - fs::mount_options::set_default($part, - security => security::level::get(), - lang::fs_options(lang::read())); - - my ($options, $unknown) = fs::mount_options::unpack($part); - $options->{sync} = $o_sync if defined($o_sync); - $options->{kudzu} = 1 if !$no_flag; - fs::mount_options::pack($part, $options, $unknown); + my ($part) = @_; + $part->{is_removable} = 1; } sub set_mount_point { @@ -113,7 +104,7 @@ sub main { my $all_hds = fsedit::get_hds(); my $hd = find { fs::get::is_same_hd($_, $device) } fs::get::hds($all_hds); $hd or die "unable to find hd for $device->{device}"; - my @parts = grep { !fsedit::isSwap($_) } partition_table::get_normal_parts($hd); + my @parts = grep { !fsedit::isSwap($_) && fs::type::maybeFormatted($_) } partition_table::get_normal_parts($hd); configure_part($action, $_, 'hd') foreach @parts; } else { configure_part($action, $device, undef); @@ -124,7 +115,7 @@ sub configure_part { my ($action, $part, $is_hd) = @_; my $fstab_file = '/etc/fstab'; if (!$part) { - print STDERR "Can not find device $device_name\n" if $::testing; + print STDERR "Cannot find device $device_name\n" if $::testing; return; } elsif ($::testing) { cp_af('/etc/fstab', $fstab_file = '/tmp/fstab'); @@ -143,9 +134,8 @@ sub configure_part { print STDERR "Already in fstab\n" if $::testing; return; } - my %dynamic = getVarsFromSh('/etc/sysconfig/dynamic'); - set_options($part, to_bool($dynamic{SYNC} ne 'no')); set_mount_point($part, $fstab, $is_hd) or return; + set_options($part); my ($line) = fs::prepare_write_fstab([$part]); if ($line) { @@ -153,7 +143,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 { @@ -161,17 +151,11 @@ 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); - if ($::auto) { + if ($verbose) { print "$_->{mntpoint}\n" foreach @$existing_fstab_entries; } } |