summaryrefslogtreecommitdiffstats
path: root/perl-install/fsedit.pm
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2004-05-13 08:44:38 +0000
committerPascal Rigaux <pixel@mandriva.com>2004-05-13 08:44:38 +0000
commite1933587d5bda45845e33ebe761fc917ca516fad (patch)
tree6c3711a00856e2c2aa9bde16a65d12367359e806 /perl-install/fsedit.pm
parent4f9a0847bf8627db6e513ff41491713cab21c17c (diff)
downloaddrakx-e1933587d5bda45845e33ebe761fc917ca516fad.tar
drakx-e1933587d5bda45845e33ebe761fc917ca516fad.tar.gz
drakx-e1933587d5bda45845e33ebe761fc917ca516fad.tar.bz2
drakx-e1933587d5bda45845e33ebe761fc917ca516fad.tar.xz
drakx-e1933587d5bda45845e33ebe761fc917ca516fad.zip
really handle LABEL=XXX in fstab (as used by redhat) (no xfs labels yet)
Diffstat (limited to 'perl-install/fsedit.pm')
-rw-r--r--perl-install/fsedit.pm10
1 files changed, 10 insertions, 0 deletions
diff --git a/perl-install/fsedit.pm b/perl-install/fsedit.pm
index 9f6874ce9..69b9bf826 100644
--- a/perl-install/fsedit.pm
+++ b/perl-install/fsedit.pm
@@ -229,6 +229,15 @@ sub hds {
my $type = typeOfPart($_->{device});
$_->{type} = $type if ($type & 0xff) == $wanted_type || $type && $hd->isa('partition_table::gpt');
}
+
+ foreach (partition_table::get_normal_parts($hd)) {
+ my $label =
+ member(type2fs($_), qw(ext2 ext3)) ?
+ c::get_ext2_label(devices::make($_->{device})) :
+ '';
+ $_->{device_LABEL} = $label if $label;
+ }
+
push @hds, $hd;
}
@@ -321,6 +330,7 @@ sub is_same_hd {
$s1 eq $s2;
} else {
$hd1->{devfs_device} && $hd2->{devfs_device} && $hd1->{devfs_device} eq $hd2->{devfs_device}
+ || $hd1->{device_LABEL} && $hd2->{device_LABEL} && $hd1->{device_LABEL} eq $hd2->{device_LABEL}
|| $hd1->{device} eq $hd2->{device};
}
}