summaryrefslogtreecommitdiffstats
path: root/perl-install
diff options
context:
space:
mode:
Diffstat (limited to 'perl-install')
-rw-r--r--perl-install/fs/wild_device.pm2
-rw-r--r--perl-install/install/NEWS2
-rw-r--r--perl-install/install/install2.pm1
3 files changed, 4 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} ?
diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS
index 03a87e848..d180415ad 100644
--- a/perl-install/install/NEWS
+++ b/perl-install/install/NEWS
@@ -1,3 +1,5 @@
+- add global variable settable via "use_uuid" on kernel cmdline
+
Version 10.4.185 - 4 September 2007, by Pascal "Pixel" Rigaux
- fix gnome choice in "choose desktop" step (#33101)
diff --git a/perl-install/install/install2.pm b/perl-install/install/install2.pm
index 85f42d08e..7536ec35c 100644
--- a/perl-install/install/install2.pm
+++ b/perl-install/install/install2.pm
@@ -363,6 +363,7 @@ sub main {
newt => sub { $o->{interactive} = "curses" },
text => sub { $o->{interactive} = "curses" },
stdio => sub { $o->{interactive} = "stdio" },
+ use_uuid => sub { $::uuid_by_default = $v },
kickstart => sub { $::auto_install = $v },
local_install => sub { $::local_install = 1 },
uml_install => sub { $::uml_install = $::local_install = 1 },