summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--perl-install/fs/wild_device.pm8
-rw-r--r--perl-install/install/NEWS1
2 files changed, 8 insertions, 1 deletions
diff --git a/perl-install/fs/wild_device.pm b/perl-install/fs/wild_device.pm
index 0e10f19ab..f31390d9e 100644
--- a/perl-install/fs/wild_device.pm
+++ b/perl-install/fs/wild_device.pm
@@ -76,6 +76,12 @@ sub to_subpart {
$part;
}
+sub _prefer_device_UUID {
+ my ($part) = @_;
+ $part->{prefer_device_UUID} ||
+ !$::no_uuid_by_default && $part->{device} =~ /^(hd|sd)/;
+}
+
sub from_part {
my ($prefix, $part) = @_;
@@ -83,7 +89,7 @@ sub from_part {
'LABEL=' . $part->{device_LABEL};
} elsif ($part->{device_alias}) {
"/dev/$part->{device_alias}";
- } elsif (!$part->{prefer_device} && ($part->{prefer_device_UUID} || !$::no_uuid_by_default) && $part->{device_UUID}) {
+ } elsif (!$part->{prefer_device} && $part->{device_UUID} && _prefer_device_UUID($part)) {
'UUID=' . $part->{device_UUID};
} else {
my $faked_device = exists $part->{faked_device} ?
diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS
index 469550c84..affb62cdb 100644
--- a/perl-install/install/NEWS
+++ b/perl-install/install/NEWS
@@ -1,3 +1,4 @@
+- do not use UUID for software raid, only for hdx and sdx
- keep current UUID when formatting ext2/ext3 (was already done for swap),
so that fstab on other distros continue to work (#39913)
(requires e2fsprogs-1.41.1-2mnb2)