From d1098abfb443fb7cf8cbc97ad96a303fa5c749f8 Mon Sep 17 00:00:00 2001
From: Pascal Rigaux <pixel@mandriva.com>
Date: Wed, 17 Sep 2008 11:51:29 +0000
Subject: - bootloader-config:   o --action migrate-to-uuids: do not migrate
 software raid to UUID (#43928)

also fix a small typo in bootloader-config
---
 perl-install/standalone/bootloader-config | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'perl-install/standalone/bootloader-config')

diff --git a/perl-install/standalone/bootloader-config b/perl-install/standalone/bootloader-config
index 17446b581..8c3dc7466 100755
--- a/perl-install/standalone/bootloader-config
+++ b/perl-install/standalone/bootloader-config
@@ -284,7 +284,7 @@ sub _migrate_to_uuids__fstab() {
 
 sub _migrate_dev_to_uuid {
     my ($fstab, $dev) = @_;
-    $dev && $dev =~ m!/dev/! or next;
+    $dev && $dev =~ m!/dev/! or return;
 
     my $part = fs::get::device2part($dev, $fstab);
     $part && $part->{device_UUID} && "UUID=$part->{device_UUID}";
@@ -292,7 +292,8 @@ sub _migrate_dev_to_uuid {
 
 sub _set_prefer_device_UUID {
     my ($part) = @_;
-    $part->{device_UUID} && !$part->{prefer_device_UUID} && !$part->{prefer_device_LABEL} or return;
+    $part->{device_UUID} && !$part->{prefer_device_UUID} && !$part->{prefer_device_LABEL}
+      && devices::should_prefer_UUID($part->{device}) or return;
     $part->{prefer_device_UUID} = 1;
     $part->{prefer_device} = 0;
     1;
-- 
cgit v1.2.1