diff options
| author | Pascal Rigaux <pixel@mandriva.com> | 2004-05-13 08:44:38 +0000 |
|---|---|---|
| committer | Pascal Rigaux <pixel@mandriva.com> | 2004-05-13 08:44:38 +0000 |
| commit | e1933587d5bda45845e33ebe761fc917ca516fad (patch) | |
| tree | 6c3711a00856e2c2aa9bde16a65d12367359e806 /perl-install/diskdrake | |
| parent | 4f9a0847bf8627db6e513ff41491713cab21c17c (diff) | |
| download | drakx-backup-do-not-use-e1933587d5bda45845e33ebe761fc917ca516fad.tar drakx-backup-do-not-use-e1933587d5bda45845e33ebe761fc917ca516fad.tar.gz drakx-backup-do-not-use-e1933587d5bda45845e33ebe761fc917ca516fad.tar.bz2 drakx-backup-do-not-use-e1933587d5bda45845e33ebe761fc917ca516fad.tar.xz drakx-backup-do-not-use-e1933587d5bda45845e33ebe761fc917ca516fad.zip | |
really handle LABEL=XXX in fstab (as used by redhat) (no xfs labels yet)
Diffstat (limited to 'perl-install/diskdrake')
| -rw-r--r-- | perl-install/diskdrake/interactive.pm | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/perl-install/diskdrake/interactive.pm b/perl-install/diskdrake/interactive.pm index cb5d3bb9c..19b59fa99 100644 --- a/perl-install/diskdrake/interactive.pm +++ b/perl-install/diskdrake/interactive.pm @@ -29,6 +29,8 @@ struct part { string device # 'hda5', 'sdc1' ... string devfs_device # 'ide/host0/bus0/target0/lun0/part5', ... string prefer_devfs_name # should the {devfs_device} or the {device} be used in fstab + string device_LABEL # volume label. LABEL=xxx can be used in fstab instead of + string prefer_device_LABEL # should the {device_LABEL} or the {device} be used in fstab string rootDevice # 'sda', 'hdc' ... (can also be a VG_name) string real_mntpoint # directly on real /, '/tmp/hdimage' ... string mntpoint # '/', '/usr' ... @@ -36,6 +38,7 @@ struct part { string device_windobe # 'C', 'D' ... string encrypt_key # [0-9A-Za-z./]{20,} string comment # comment to have in fstab + string volume_label # bool isMounted @@ -1150,6 +1153,8 @@ sub format_part_info { $info .= N("Mount point: ") . "$part->{mntpoint}\n" if $part->{mntpoint}; $info .= N("Device: ") . "$part->{device}\n" if $part->{device} && !isLoopback($part); + $info .= N("Devfs name: ") . "$part->{devfs_device}\n" if $part->{devfs_device} && $::expert; + $info .= N("Volume label: ") . "$part->{device_LABEL}\n" if $part->{device_LABEL} && $::expert; $info .= N("DOS drive letter: %s (just a guess)\n", $part->{device_windobe}) if $part->{device_windobe}; if (arch() eq "ppc") { my $new_value = $part->{pType}; |