From b7756ee40c8b9798eb84d817aadf640945086295 Mon Sep 17 00:00:00 2001
From: Pascal Rigaux <pixel@mandriva.com>
Date: Tue, 4 Sep 2007 08:11:19 +0000
Subject: - add global variable settable via "use_uuid" on kernel cmdline

(it sets global variable $::uuid_by_default)
---
 perl-install/fs/wild_device.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'perl-install/fs')

diff --git a/perl-install/fs/wild_device.pm b/perl-install/fs/wild_device.pm
index ebb391cdf..be4a43dfd 100644
--- a/perl-install/fs/wild_device.pm
+++ b/perl-install/fs/wild_device.pm
@@ -83,7 +83,7 @@ sub from_part {
 	'LABEL=' . $part->{device_LABEL};
     } elsif ($part->{device_alias}) {
 	"/dev/$part->{device_alias}";
-    } elsif ($part->{prefer_device_UUID} && $part->{device_UUID}) {
+    } elsif (!$part->{prefer_device} && ($part->{prefer_device_UUID} || $::uuid_by_default) && $part->{device_UUID}) {
 	'UUID=' . $part->{device_UUID};
     } else {
 	my $faked_device = exists $part->{faked_device} ? 
-- 
cgit v1.2.1