From ccb60c6927d79a80535ea063e3d6a5482773ade7 Mon Sep 17 00:00:00 2001 From: Pascal Rigaux Date: Wed, 5 Jan 2005 11:24:50 +0000 Subject: don't set fs_type to ext2:vfat for ext3 or reiserfs /home coming from usb key (bugzilla #9827) --- perl-install/fs/mount_options.pm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'perl-install/fs/mount_options.pm') 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'; -- cgit v1.2.1