diff options
| author | Pascal Rigaux <pixel@mandriva.com> | 2005-08-29 11:15:26 +0000 |
|---|---|---|
| committer | Pascal Rigaux <pixel@mandriva.com> | 2005-08-29 11:15:26 +0000 |
| commit | e7b1331c202efedff015e1d7978cefb4afb3e1aa (patch) | |
| tree | 8cf06f843ed34172046fec891ba0a5d8d5895df9 | |
| parent | 246cf2a7d54e9815a0a8a016131b2795aacdb7b9 (diff) | |
| download | drakx-e7b1331c202efedff015e1d7978cefb4afb3e1aa.tar drakx-e7b1331c202efedff015e1d7978cefb4afb3e1aa.tar.gz drakx-e7b1331c202efedff015e1d7978cefb4afb3e1aa.tar.bz2 drakx-e7b1331c202efedff015e1d7978cefb4afb3e1aa.tar.xz drakx-e7b1331c202efedff015e1d7978cefb4afb3e1aa.zip | |
use vol_id to get filesystem label (we only handled the equivalenet of e2label)
| -rw-r--r-- | perl-install/c/stuff.xs.pl | 17 | ||||
| -rw-r--r-- | perl-install/fsedit.pm | 7 | ||||
| -rw-r--r-- | perl-install/share/list.xml | 1 |
3 files changed, 3 insertions, 22 deletions
diff --git a/perl-install/c/stuff.xs.pl b/perl-install/c/stuff.xs.pl index 4c95e5b0d..5cf4b3801 100644 --- a/perl-install/c/stuff.xs.pl +++ b/perl-install/c/stuff.xs.pl @@ -219,23 +219,6 @@ is_ext3(device_name) OUTPUT: RETVAL -char * -get_ext2_label(device_name) - char * device_name - CODE: - { - ext2_filsys fs; - int retval = ext2fs_open (device_name, 0, 0, 0, unix_io_manager, &fs); - if (retval) { - RETVAL = 0; - } else { - RETVAL = fs->super->s_volume_name; - ext2fs_close(fs); - } - } - OUTPUT: - RETVAL - void init_setlocale() CODE: diff --git a/perl-install/fsedit.pm b/perl-install/fsedit.pm index cbe94f5c1..108fadde1 100644 --- a/perl-install/fsedit.pm +++ b/perl-install/fsedit.pm @@ -244,11 +244,8 @@ Do you agree to lose all the partitions? } foreach (@parts) { - my $label = - member($_->{fs_type}, qw(ext2 ext3)) ? - c::get_ext2_label(devices::make($_->{device})) : - ''; - $_->{device_LABEL} = $label if $label; + my $label = run_program::get_stdout('vol_id', '-l', devices::make($_->{device})); + $_->{device_LABEL} = chomp_($label) if $label; } if ($hd->{usb_media_type}) { diff --git a/perl-install/share/list.xml b/perl-install/share/list.xml index f62682c56..7df24f8e9 100644 --- a/perl-install/share/list.xml +++ b/perl-install/share/list.xml @@ -14,6 +14,7 @@ losetup lvm2 mdadm mount + vol_id badblocks mkswap |