summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--perl-install/fs/wild_device.pm2
-rw-r--r--perl-install/install/install2.pm2
2 files changed, 2 insertions, 2 deletions
diff --git a/perl-install/fs/wild_device.pm b/perl-install/fs/wild_device.pm
index be4a43dfd..206428402 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} && ($part->{prefer_device_UUID} || $::uuid_by_default) && $part->{device_UUID}) {
+ } elsif (!$part->{prefer_device} && ($part->{prefer_device_UUID} || $::isInstall && $::o->{uuid_by_default}) && $part->{device_UUID}) {
'UUID=' . $part->{device_UUID};
} else {
my $faked_device = exists $part->{faked_device} ?
diff --git a/perl-install/install/install2.pm b/perl-install/install/install2.pm
index 7536ec35c..652598b97 100644
--- a/perl-install/install/install2.pm
+++ b/perl-install/install/install2.pm
@@ -363,7 +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 },
+ use_uuid => sub { $o->{uuid_by_default} = $v },
kickstart => sub { $::auto_install = $v },
local_install => sub { $::local_install = 1 },
uml_install => sub { $::uml_install = $::local_install = 1 },