diff options
| author | Pascal Rigaux <pixel@mandriva.com> | 2005-10-18 08:38:20 +0000 |
|---|---|---|
| committer | Pascal Rigaux <pixel@mandriva.com> | 2005-10-18 08:38:20 +0000 |
| commit | 8f485f147fc9e6e42ab4f3dd1c3a19461c1f9694 (patch) | |
| tree | e2680eaf2d1452c2af48834010be83d0e3b03c28 /perl-install/fsedit.pm | |
| parent | fd1828130f2a8f64f6ee63e0070246122327338e (diff) | |
| download | drakx-8f485f147fc9e6e42ab4f3dd1c3a19461c1f9694.tar drakx-8f485f147fc9e6e42ab4f3dd1c3a19461c1f9694.tar.gz drakx-8f485f147fc9e6e42ab4f3dd1c3a19461c1f9694.tar.bz2 drakx-8f485f147fc9e6e42ab4f3dd1c3a19461c1f9694.tar.xz drakx-8f485f147fc9e6e42ab4f3dd1c3a19461c1f9694.zip | |
use vol_id to find device type (fs_type and pt_type)
Diffstat (limited to 'perl-install/fsedit.pm')
| -rw-r--r-- | perl-install/fsedit.pm | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/perl-install/fsedit.pm b/perl-install/fsedit.pm index c06944a13..7c968e915 100644 --- a/perl-install/fsedit.pm +++ b/perl-install/fsedit.pm @@ -237,7 +237,7 @@ Do you agree to lose all the partitions? my @parts = partition_table::get_normal_parts($hd); # checking the magic of the filesystem, do not rely on pt_type - foreach (grep { member($_->{fs_type}, 'vfat', 'ntfs', 'ext2') || $_->{pt_type} == 0x100 } @parts) { + foreach (@parts) { if (my $type = fs::type::type_subpart_from_magic($_)) { if ($type->{fs_type}) { #- keep {pt_type} @@ -248,11 +248,7 @@ Do you agree to lose all the partitions? } else { $_->{bad_fs_type_magic} = 1; } - } - - foreach (@parts) { - my $label = run_program::get_stdout('vol_id', '-l', devices::make($_->{device})); - $_->{device_LABEL} = chomp_($label) if $label; + $_->{device_LABEL} = $_->{LABEL_from_magic} if $_->{LABEL_from_magic}; } if ($hd->{usb_media_type}) { |