when adding users during install, suggest the user names found in /home

1 files changed, 5 insertions, 4 deletions

diff --git a/perl-install/any.pm b/perl-install/any.pm
index 67d540631..f49318924 100644
--- a/perl-install/any.pm
+++ b/perl-install/any.pm
@@ -495,7 +495,7 @@ sub inspect {
 }
 
 sub ask_user_one {
-    my ($in, $users, $security, %options) = @_;
+    my ($in, $users, $security, $u, %options) = @_;
 
     my @icons = facesnames();
 
@@ -508,7 +508,6 @@ sub ask_user_one {
 	ctools => N("access to compilation tools"),
     );
 
-    my $u;
     $u->{password2} ||= $u->{password} ||= '';
     $u->{shell} ||= '/bin/bash';
     my $names = @$users ? N("(already added %s)", join(", ", map { $_->{realname} || $_->{name} } @$users)) : '';
@@ -563,10 +562,12 @@ sub ask_user_one {
 }
 
 sub ask_users {
-    my ($in, $users, $security) = @_;
+    my ($in, $users, $security, $suggested_names) = @_;
 
     while (1) {
-        ask_user_one($in, $users, $security) and return;
+	my $u = {};
+	$u->{name} = shift @$suggested_names;
+        ask_user_one($in, $users, $security, $u) and return;
     }
 }