pass autologin hash to set_autologin

2 files changed, 11 insertions, 5 deletions

diff --git a/perl-install/standalone/drakboot b/perl-install/standalone/drakboot
index cb77da9f1..0cce1384e 100755
--- a/perl-install/standalone/drakboot
+++ b/perl-install/standalone/drakboot
@@ -224,10 +224,13 @@ sub autologin_choice() {
                         Xconfig::various::runlevel($x_mode ? 5 : 3);
                         $::testing and return;
                         if ($auto_buttons[1]->get_active) {
-                            any::set_autologin($in->do_pkgs, $user_combo->entry->get_text, $desktop_combo->entry->get_text);
+                            $auto_mode->{user} = $user_combo->entry->get_text;
+                            $auto_mode->{desktop} = $desktop_combo->entry->get_text;
 			} else {
-                            any::set_autologin($in->do_pkgs);
-			}
+                            $auto_mode->{user} = undef;
+                            $auto_mode->{desktop} = undef;
+                        }
+                        any::set_autologin($in->do_pkgs, $auto_mode);
                     });
 }
 
diff --git a/perl-install/standalone/finish-install b/perl-install/standalone/finish-install
index d715e8c8d..c8cd43096 100755
--- a/perl-install/standalone/finish-install
+++ b/perl-install/standalone/finish-install
@@ -149,8 +149,11 @@ sub ask_users() {
         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;
+    if ($autologin_first) {
+        $autologin->{user} = $users->[0]{name};
+        $autologin->{desktop} = $autologin_first;
+        any::set_autologin($in->do_pkgs, $autologin);
+    }
     my $finit_conf = "/etc/finit.conf";
     substInFile {
         s/^user .*//;