diff options
author | Thierry Vignaud <tvignaud@mandriva.org> | 2004-06-18 04:23:55 +0000 |
---|---|---|
committer | Thierry Vignaud <tvignaud@mandriva.org> | 2004-06-18 04:23:55 +0000 |
commit | 1e981e770b74cadcf5926dedad37f69b45b097ab (patch) | |
tree | d13085ce2523bd30c46178e6644804c792c9edfa /perl-install/standalone/drakupdate_fstab | |
parent | b47c58af1703e7d851e0d7b489a70bff15d5f28d (diff) | |
download | drakx-backup-do-not-use-1e981e770b74cadcf5926dedad37f69b45b097ab.tar drakx-backup-do-not-use-1e981e770b74cadcf5926dedad37f69b45b097ab.tar.gz drakx-backup-do-not-use-1e981e770b74cadcf5926dedad37f69b45b097ab.tar.bz2 drakx-backup-do-not-use-1e981e770b74cadcf5926dedad37f69b45b097ab.tar.xz drakx-backup-do-not-use-1e981e770b74cadcf5926dedad37f69b45b097ab.zip |
merge floppies support from MDK-10-branch
Diffstat (limited to 'perl-install/standalone/drakupdate_fstab')
-rwxr-xr-x | perl-install/standalone/drakupdate_fstab | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/perl-install/standalone/drakupdate_fstab b/perl-install/standalone/drakupdate_fstab index 12f3d959c..c911f7055 100755 --- a/perl-install/standalone/drakupdate_fstab +++ b/perl-install/standalone/drakupdate_fstab @@ -83,6 +83,7 @@ sub device_name_to_entry { } else { $e->{device} = $name; #- keeping the exact name given (often is the devfs name) } + $e->{media_type} = 'fd' if $name =~ /fd[01]/; $e; } @@ -130,7 +131,7 @@ sub main { cp_af('/etc/fstab', $fstab_file = '/tmp/fstab'); } - my $fstab = [ fs::read_fstab('', '/etc/fstab', 'keep_default', 'verbatim_credentials') ]; + my $fstab = [ fs::read_fstab('', '/etc/fstab', 'keep_freq_passno', 'keep_devfs_name', 'verbatim_credentials') ]; my ($existing_fstab_entries, $fstab_) = partition { $_->{device} eq $part->{device} || $_->{device} eq $part->{devfs_device} } @$fstab; if ($action eq 'add') { @@ -143,7 +144,10 @@ sub main { set_mount_point($part, $fstab) or return; my ($line) = fs::prepare_write_fstab([$part]); - append_to_file($fstab_file, $line) if $line; + if ($line) { + append_to_file($fstab_file, $line); + system("mount $part->{mntpoint}") if !$::testing && $device_name =~ /^fd\d+/; + } if ($::auto) { print $part->{mntpoint}, " ", $useSupermount ? 'supermount' : 'user', "\n"; |