summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOlivier Blin <oblin@mandriva.com>2008-03-20 17:41:10 +0000
committerOlivier Blin <oblin@mandriva.com>2008-03-20 17:41:10 +0000
commit681fec3a84d69616b94297092a08641e29b63361 (patch)
tree86169d4ec04e1eceeeed56f1cb9ebb80c4b09965
parent72be09561b1eb0a51048eaec1af096ddfe74aeb0 (diff)
downloaddrakx-681fec3a84d69616b94297092a08641e29b63361.tar
drakx-681fec3a84d69616b94297092a08641e29b63361.tar.gz
drakx-681fec3a84d69616b94297092a08641e29b63361.tar.bz2
drakx-681fec3a84d69616b94297092a08641e29b63361.tar.xz
drakx-681fec3a84d69616b94297092a08641e29b63361.zip
allow to ask both root and user accounts in the same step
-rw-r--r--perl-install/NEWS2
-rwxr-xr-xperl-install/standalone/finish-install4
2 files changed, 5 insertions, 1 deletions
diff --git a/perl-install/NEWS b/perl-install/NEWS
index 3fbb34ff8..a000794c6 100644
--- a/perl-install/NEWS
+++ b/perl-install/NEWS
@@ -5,6 +5,8 @@
o keep existing swap UUID (#38877)
- partitioning wizard: do not show error message in wizard mode when
cancel is clicked (clean wizard window instead)
+- finish-install:
+ o allow to ask both root and user accounts in the same step
Version 10.17 - 20 March 2008
diff --git a/perl-install/standalone/finish-install b/perl-install/standalone/finish-install
index 84bda2e53..e2a716927 100755
--- a/perl-install/standalone/finish-install
+++ b/perl-install/standalone/finish-install
@@ -99,9 +99,11 @@ sub ask_authentication() {
}
}
+#- USERS=with_root: asks both root and user accounts
sub ask_users() {
my $users = [];
- any::ask_user($in, $users, $security);
+ my $ask_root = to_bool(lc(get_conf('USERS')) eq 'with_root');
+ any::ask_user_and_root($in, $ask_root, $users, $security);
my $old_user = get_conf('USER_RENAME_FROM');
my $old_autologin;
if (@$users && $old_user) {