diff options
Diffstat (limited to 'perl-install/fs/mount_point.pm')
| -rw-r--r-- | perl-install/fs/mount_point.pm | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/perl-install/fs/mount_point.pm b/perl-install/fs/mount_point.pm index be1c51c72..5854d4ebe 100644 --- a/perl-install/fs/mount_point.pm +++ b/perl-install/fs/mount_point.pm @@ -1,4 +1,4 @@ -package fs::mount_point; # $Id: mount_point.pm 243679 2008-07-29 11:55:58Z tv $ +package fs::mount_point; # $Id: mount_point.pm 269270 2010-05-24 09:55:20Z pterjan $ use diagnostics; use strict; @@ -15,7 +15,7 @@ sub guess_mount_point { '/boot' => 'vmlinuz', '/tmp' => '.X11-unix', '/usr' => 'src', - '/var' => 'catman', + '/var' => 'spool', ); my $handle = any::inspect($part, $prefix) or return; @@ -47,15 +47,15 @@ sub suggest_mount_points { sub suggest_mount_points_always { my ($fstab) = @_; - my @win = grep { isFat_or_NTFS($_) && maybeFormatted($_) && !$_->{is_removable} && $_->{pt_type} != 0x12 } @$fstab; + my @win = grep { isFat_or_NTFS($_) && !$_->{isMounted} && maybeFormatted($_) && !$_->{is_removable} && $_->{pt_type} != 0x12 && !isRecovery($_)} @$fstab; log::l("win parts: ", join ",", map { $_->{device} } @win) if @win; if (@win == 1) { #- Suggest /boot/efi on ia64. - $win[0]{mntpoint} = arch() =~ /ia64/ ? "/boot/efi" : "/mnt/windows"; + $win[0]{mntpoint} = arch() =~ /ia64/ ? "/boot/efi" : "/media/windows"; } else { my %w; foreach (@win) { my $v = $w{$_->{device_windobe}}++; - $_->{mntpoint} = $_->{unsafeMntpoint} = "/mnt/win_" . lc($_->{device_windobe}) . ($v ? $v+1 : ''); #- lc cuz of StartOffice(!) cf dadou + $_->{mntpoint} = $_->{unsafeMntpoint} = "/media/win_" . lc($_->{device_windobe}) . ($v ? $v+1 : ''); #- lc cuz of StartOffice(!) cf dadou } } @@ -80,8 +80,8 @@ sub validate_mount_points { $m{$m} and die N("Duplicate mount point %s", $m); $m{$m} = 1; - #- in case the type does not correspond, force it to ext3 - fs::type::set_fs_type($_, 'ext3') if !isTrueFS($_) && !isOtherAvailableFS($_); + #- in case the type does not correspond, force it to default fs (ext4 currently) + fs::type::set_fs_type($_, defaultFS()) if !isTrueFS($_) && !isOtherAvailableFS($_); } 1; } |