summaryrefslogtreecommitdiffstats
path: root/perl-install/diskdrake
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2007-08-31 16:33:16 +0000
committerPascal Rigaux <pixel@mandriva.com>2007-08-31 16:33:16 +0000
commita6ba2f19bd2dd6d99185cb0f5ba0dd97baaf130d (patch)
treecd7cedd073f1494500f4f69a63f0f63e9af673a7 /perl-install/diskdrake
parentb18b20791cfce5c52a8fb20f2579449b6500da24 (diff)
downloaddrakx-a6ba2f19bd2dd6d99185cb0f5ba0dd97baaf130d.tar
drakx-a6ba2f19bd2dd6d99185cb0f5ba0dd97baaf130d.tar.gz
drakx-a6ba2f19bd2dd6d99185cb0f5ba0dd97baaf130d.tar.bz2
drakx-a6ba2f19bd2dd6d99185cb0f5ba0dd97baaf130d.tar.xz
drakx-a6ba2f19bd2dd6d99185cb0f5ba0dd97baaf130d.zip
- support for UUID (including UUID=xxx in fstab)
(not by default for now)
Diffstat (limited to 'perl-install/diskdrake')
-rw-r--r--perl-install/diskdrake/interactive.pm4
1 files changed, 4 insertions, 0 deletions
diff --git a/perl-install/diskdrake/interactive.pm b/perl-install/diskdrake/interactive.pm
index 9f3413dae..6bc390f0f 100644
--- a/perl-install/diskdrake/interactive.pm
+++ b/perl-install/diskdrake/interactive.pm
@@ -35,7 +35,10 @@ struct part {
int part_number # 1 for hda1...
string device # 'hda5', 'sdc1' ...
string device_LABEL # volume label. LABEL=xxx or /dev/disk/by-label/xxx can be used in fstab instead of the device
+ string device_UUID # volume UUID. UUID=xxx or /dev/disk/by-uuid/xxx can be used in fstab instead of the device
bool prefer_device_LABEL # should the {device_LABEL} or the {device} be used in fstab
+ bool prefer_device_UUID # should the {device_UUID} or the {device} be used in fstab
+ bool prefer_device # should the {device} be used in fstab
bool faked_device # false if {device} is a real device, true for nfs/smb/dav/none devices. If the field does not exist, we do not know
string rootDevice # 'sda', 'hdc' ... (can also be a VG_name)
@@ -1235,6 +1238,7 @@ 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("Volume label: ") . "$part->{device_LABEL}\n" if $part->{device_LABEL} && $::expert;
+ $info .= N("UUID: ") . "$part->{device_UUID}\n" if $::expert && $part->{device_UUID};
$info .= N("DOS drive letter: %s (just a guess)\n", $part->{device_windobe}) if $part->{device_windobe};
if (arch() eq "ppc") {
my $pType = $part->{pType};