summaryrefslogtreecommitdiffstats
path: root/perl-install/fs
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2007-09-04 08:11:19 +0000
committerPascal Rigaux <pixel@mandriva.com>2007-09-04 08:11:19 +0000
commitb7756ee40c8b9798eb84d817aadf640945086295 (patch)
treee3fcc18689694707a8c7864a12662e08b55eaacd /perl-install/fs
parent2d06c5b0b1e5ea7186a0b6493413fd072672c6bc (diff)
downloaddrakx-backup-do-not-use-b7756ee40c8b9798eb84d817aadf640945086295.tar
drakx-backup-do-not-use-b7756ee40c8b9798eb84d817aadf640945086295.tar.gz
drakx-backup-do-not-use-b7756ee40c8b9798eb84d817aadf640945086295.tar.bz2
drakx-backup-do-not-use-b7756ee40c8b9798eb84d817aadf640945086295.tar.xz
drakx-backup-do-not-use-b7756ee40c8b9798eb84d817aadf640945086295.zip
- add global variable settable via "use_uuid" on kernel cmdline
(it sets global variable $::uuid_by_default)
Diffstat (limited to 'perl-install/fs')
-rw-r--r--perl-install/fs/wild_device.pm2
1 files changed, 1 insertions, 1 deletions
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} ?