diff options
Diffstat (limited to 'perl-install/standalone/drakupdate_fstab')
| -rwxr-xr-x | perl-install/standalone/drakupdate_fstab | 96 |
1 files changed, 31 insertions, 65 deletions
diff --git a/perl-install/standalone/drakupdate_fstab b/perl-install/standalone/drakupdate_fstab index b36b7d162..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-2005 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,24 +51,10 @@ 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); - -sub check_hard_drives { - my ($name) = @_; - - #- do not do anything if there are many partitions - #- otherwise we may add main extended partitions - if (my ($path, $prefix) = $name =~ m!^(.*)/(\w+)\d+$!) { - my @parts = grep { /^\Q$prefix\E\d+$/ } all($path); - @parts <= 1; - } else { - 1; - } -} - sub device_name_to_entry { my ($name) = @_; $name =~ s|/dev/||; @@ -80,17 +66,7 @@ sub device_name_to_entry { } my $e; - if (my ($devfs_prefix, $nb) = $name =~ m,(.*)/(?:cd|disc|part(\d+))$,) { - $e = find { $_->{devfs_prefix} eq $devfs_prefix } @l; - $e->{part_number} = $nb; - $e->{devfs_prefix} ||= $devfs_prefix; - $e->{devfs_device} = $e->{devfs_prefix} . '/part' . $nb; - if ($e->{devfs_device} eq $name) { - $e->{prefer_devfs_name} = 1; - } else { - $e->{devfs_device} = $e->{device} = $name; - } - } else { + { unless ($e = find { $name eq $_->{device} } @l) { my ($prefix) = $name =~ m/^(.*?)\d*$/; $e = find { $prefix eq ($_->{prefix} || $_->{device}) } @l; @@ -103,25 +79,15 @@ sub device_name_to_entry { } sub set_options { - my ($part, $useSupermount, $o_sync) = @_; - - $part->{is_removable} = 1; #- force removable flag - fs::mount_options::set_default($part, - useSupermount => $useSupermount, - 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 { - my ($part, $fstab) = @_; + my ($part, $fstab, $is_hd) = @_; - my $mntpoint = detect_devices::suggest_mount_point($part) or return; - $mntpoint = "/mnt/$mntpoint"; + my $mntpoint = $is_hd ? 'hd' : detect_devices::suggest_mount_point($part); + $mntpoint = "/media/$mntpoint"; foreach ('', 2 .. 10) { next if fs::get::mntpoint2part("$mntpoint$_", $fstab); @@ -132,22 +98,30 @@ sub set_mount_point { } sub main { - my ($action, $device_name) = @_; - - if ($::auto) { - check_hard_drives($device_name) or return; + my ($action, $device_name) = @_; + my $device = device_name_to_entry($device_name); + if ($device->{media_type} eq 'hd') { + 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($_) && fs::type::maybeFormatted($_) } partition_table::get_normal_parts($hd); + configure_part($action, $_, 'hd') foreach @parts; + } else { + configure_part($action, $device, undef); } +} - my $part = device_name_to_entry($device_name); +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'); } - my $fstab = [ fs::read_fstab('', '/etc/fstab', 'keep_freq_passno', 'keep_devfs_name', 'verbatim_credentials') ]; + my $fstab = [ fs::read_fstab('', '/etc/fstab', 'keep_freq_passno', 'verbatim_credentials') ]; my ($existing_fstab_entries, $fstab_) = partition { fs::get::is_same_hd($_, $part) } @$fstab; if ($debug) { @@ -160,36 +134,28 @@ sub main { print STDERR "Already in fstab\n" if $::testing; return; } - my %dynamic = getVarsFromSh('/etc/sysconfig/dynamic'); - my $useSupermount = $dynamic{SUPERMOUNT} eq 'yes' ? 'magicdev' : ''; - set_options($part, $useSupermount, to_bool($dynamic{SYNC} ne 'no')); - set_mount_point($part, $fstab) or return; + set_mount_point($part, $fstab, $is_hd) or return; + set_options($part); my ($line) = fs::prepare_write_fstab([$part]); if ($line) { append_to_file($fstab_file, $line); - system("mount $part->{mntpoint}") if !$::testing && $device_name =~ /^fd\d+/; + system("mount $part->{mntpoint}") if !$::testing && ($device_name =~ /^fd\d+/ || $is_hd); } - if ($::auto) { - print $part->{mntpoint}, " ", $useSupermount ? 'supermount' : 'user', "\n"; + if ($verbose) { + print $part->{mntpoint}, " user\n"; } } else { if (!@$existing_fstab_entries) { 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; } } |