summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOlivier Blin <oblin@mandriva.com>2008-03-27 19:01:13 +0000
committerOlivier Blin <oblin@mandriva.com>2008-03-27 19:01:13 +0000
commitcadf729f07d8335aea014a745abbfc24a4c7482b (patch)
tree64353cc983b335da42340da23cbe65c9dd75e1d9
parentd3a1959233e05d213fa563a4e8671e4545268575 (diff)
downloaddrakx-backup-do-not-use-cadf729f07d8335aea014a745abbfc24a4c7482b.tar
drakx-backup-do-not-use-cadf729f07d8335aea014a745abbfc24a4c7482b.tar.gz
drakx-backup-do-not-use-cadf729f07d8335aea014a745abbfc24a4c7482b.tar.bz2
drakx-backup-do-not-use-cadf729f07d8335aea014a745abbfc24a4c7482b.tar.xz
drakx-backup-do-not-use-cadf729f07d8335aea014a745abbfc24a4c7482b.zip
really set the superuser password when using simplified user+root dialog (#39218)
-rw-r--r--perl-install/NEWS3
-rwxr-xr-xperl-install/standalone/finish-install3
2 files changed, 6 insertions, 0 deletions
diff --git a/perl-install/NEWS b/perl-install/NEWS
index e61fb6625..4652808a9 100644
--- a/perl-install/NEWS
+++ b/perl-install/NEWS
@@ -8,6 +8,9 @@
o handle services with "-" as default chkconfig level in more places
- mygtk2:
o allow to create buttons with stock icons (for drakguard)
+- finish-install:
+ o really set the superuser password when using simplified user+root
+ dialog (#39218)
Version 10.20 - 25 March 2008
diff --git a/perl-install/standalone/finish-install b/perl-install/standalone/finish-install
index ecc334896..ee8ca04f4 100755
--- a/perl-install/standalone/finish-install
+++ b/perl-install/standalone/finish-install
@@ -116,6 +116,9 @@ sub ask_users() {
}
my $autologin = any::get_autologin();
my $autologin_first = ($autologin->{autologin} eq $old_user || lc(get_conf('USER_AUTOLOGIN_FIRST')) eq "yes") && $autologin->{desktop};
+ if ($superuser) {
+ set_authentication($superuser) or goto &ask_users;
+ }
any::add_users($users, $authentication);
any::set_autologin($in->do_pkgs, $users->[0]{name}, $autologin_first)
if $autologin_first;