summaryrefslogtreecommitdiffstats
path: root/perl-install
diff options
context:
space:
mode:
Diffstat (limited to 'perl-install')
-rw-r--r--perl-install/NEWS2
-rw-r--r--perl-install/fs/wild_device.pm2
-rw-r--r--perl-install/install/install2.pm3
3 files changed, 4 insertions, 3 deletions
diff --git a/perl-install/NEWS b/perl-install/NEWS
index 4786f6e3a..530f93ab7 100644
--- a/perl-install/NEWS
+++ b/perl-install/NEWS
@@ -1,3 +1,5 @@
+- use UUID by default (for diskdrake and draklive-install)
+
Version 10.16.1 - 18 March 2008
- handle position for paned widgets (needed for rpmdrake, #38762)
diff --git a/perl-install/fs/wild_device.pm b/perl-install/fs/wild_device.pm
index 5d6ea5e86..0e10f19ab 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} || $::isInstall && $::o->{uuid_by_default}) && $part->{device_UUID}) {
+ } elsif (!$part->{prefer_device} && ($part->{prefer_device_UUID} || !$::no_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 56226b55d..9f2dda1cc 100644
--- a/perl-install/install/install2.pm
+++ b/perl-install/install/install2.pm
@@ -39,7 +39,6 @@ $o = $::o = {
#- packages => [ qw() ],
partitioning => { clearall => 0, eraseBadPartitions => 0, auto_allocate => 0 }, #-, readonly => 0 },
authentication => { md5 => 1, shadow => 1 },
- uuid_by_default => 1,
locale => { lang => 'en_US' },
#- isUpgrade => 0,
toRemove => [],
@@ -356,7 +355,7 @@ sub main {
newt => sub { $o->{interactive} = "curses" },
text => sub { $o->{interactive} = "curses" },
stdio => sub { $o->{interactive} = "stdio" },
- use_uuid => sub { $o->{uuid_by_default} = $v },
+ use_uuid => sub { $::no_uuid_by_default = !$v },
kickstart => sub { $::auto_install = $v },
local_install => sub { $::local_install = 1 },
uml_install => sub { $::uml_install = $::local_install = 1 },