diff options
| author | Pascal Rigaux <pixel@mandriva.com> | 2005-01-05 11:24:50 +0000 |
|---|---|---|
| committer | Pascal Rigaux <pixel@mandriva.com> | 2005-01-05 11:24:50 +0000 |
| commit | ccb60c6927d79a80535ea063e3d6a5482773ade7 (patch) | |
| tree | 078a648bc8f5999ef33fcd110d268b3d8fcce015 /perl-install/fs | |
| parent | 696dc1cedb6b86325661c1be6244cbe6d8424069 (diff) | |
| download | drakx-ccb60c6927d79a80535ea063e3d6a5482773ade7.tar drakx-ccb60c6927d79a80535ea063e3d6a5482773ade7.tar.gz drakx-ccb60c6927d79a80535ea063e3d6a5482773ade7.tar.bz2 drakx-ccb60c6927d79a80535ea063e3d6a5482773ade7.tar.xz drakx-ccb60c6927d79a80535ea063e3d6a5482773ade7.zip | |
don't set fs_type to ext2:vfat for ext3 or reiserfs /home coming from usb key (bugzilla #9827)
Diffstat (limited to 'perl-install/fs')
| -rw-r--r-- | perl-install/fs/mount_options.pm | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/perl-install/fs/mount_options.pm b/perl-install/fs/mount_options.pm index 91ac36ad9..117bbd0b2 100644 --- a/perl-install/fs/mount_options.pm +++ b/perl-install/fs/mount_options.pm @@ -167,7 +167,9 @@ sub set_default { my ($options, $unknown) = &unpack($part); - if (!$opts{ignore_is_removable} && $part->{is_removable} && !member($part->{mntpoint}, qw(/ /usr /var /boot))) { + if (!$opts{ignore_is_removable} && $part->{is_removable} + && !member($part->{mntpoint}, qw(/ /usr /var /boot)) + && (!$part->{fs_type} || $part->{fs_type} eq 'auto' || $part->{fs_type} =~ /:/)) { $options->{supermount} = $opts{useSupermount} && !($opts{useSupermount} eq 'magicdev' && $part->{media_type} eq 'cdrom'); $part->{fs_type} = !$options->{supermount} ? 'auto' : $part->{media_type} eq 'cdrom' ? 'udf:iso9660' : 'ext2:vfat'; |