From c0b4e0aba4f8b5d1235e7b473359732d00cdcd1b Mon Sep 17 00:00:00 2001
From: Olivier Blin <oblin@mandriva.com>
Date: Wed, 23 Sep 2009 16:55:47 +0000
Subject: rename autologin field as user

---
 perl-install/standalone/drakboot       | 8 ++++----
 perl-install/standalone/finish-install | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'perl-install/standalone')

diff --git a/perl-install/standalone/drakboot b/perl-install/standalone/drakboot
index 2b364f0dd..cb77da9f1 100755
--- a/perl-install/standalone/drakboot
+++ b/perl-install/standalone/drakboot
@@ -184,7 +184,7 @@ sub autologin_choice() {
     my $x_mode = Xconfig::various::runlevel() == 5;
     my $auto_mode = any::get_autologin();
 
-    my $user = member($auto_mode->{autologin}, @users) ? $auto_mode->{autologin} : $users[0];
+    my $user = member($auto_mode->{user}, @users) ? $auto_mode->{user} : $users[0];
     if (!$user) {
         # no user, bad but add root anyway:
         $user = "root";
@@ -196,14 +196,14 @@ sub autologin_choice() {
     my $auto_box = gtknew('Table', col_spacings => 5, row_spacings => 5, homogeneous => 1, children => [
                                     [ gtknew('Label_Left', text => N("Default user")), $user_combo ],
                                     [ gtknew('Label_Left', text => N("Default desktop")), $desktop_combo ] ]);
-    $auto_box->set_sensitive($auto_mode->{autologin} ? 1 : 0);
+    $auto_box->set_sensitive($auto_mode->{user} ? 1 : 0);
 
     my @auto_buttons = gtkradio((N("No, I do not want autologin")) x 2,
                                 N("Yes, I want autologin with this (user, desktop)"));
     $auto_buttons[1]->signal_connect('toggled' => sub { $auto_box->set_sensitive($auto_buttons[1]->get_active) });
     $auto_buttons[0]->signal_connect('toggled' => sub { $auto_box->set_sensitive(!$auto_buttons[0]->get_active) });
-    $auto_buttons[1]->set_active(1) if $auto_mode->{autologin};
-    $auto_buttons[0]->set_active(1) if !$auto_mode->{autologin};
+    $auto_buttons[1]->set_active(1) if $auto_mode->{user};
+    $auto_buttons[0]->set_active(1) if !$auto_mode->{user};
 
     my $x_box;
     run_boot_window(N("System mode"),
diff --git a/perl-install/standalone/finish-install b/perl-install/standalone/finish-install
index 3da4d6973..d715e8c8d 100755
--- a/perl-install/standalone/finish-install
+++ b/perl-install/standalone/finish-install
@@ -144,7 +144,7 @@ sub ask_users() {
       $users->[0]{home} ||= '/home/' . $users->[0]{name};
     }
     my $autologin = any::get_autologin();
-    my $autologin_first = ($autologin->{autologin} eq $old_user || lc(get_conf('USER_AUTOLOGIN_FIRST')) eq "yes") && $autologin->{desktop};
+    my $autologin_first = ($autologin->{user} eq $old_user || lc(get_conf('USER_AUTOLOGIN_FIRST')) eq "yes") && $autologin->{desktop};
     if ($superuser) {
         set_authentication($superuser) or goto &ask_users;
     }
-- 
cgit v1.2.1