summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOlivier Blin <oblin@mandriva.com>2009-09-23 16:55:47 +0000
committerOlivier Blin <oblin@mandriva.com>2009-09-23 16:55:47 +0000
commitc0b4e0aba4f8b5d1235e7b473359732d00cdcd1b (patch)
tree8b5e09ee7712c8e8561940e0ab2d8b50e158ceac
parent0d7eb1b30c21a35a58b67242712427f212edfdff (diff)
downloaddrakx-c0b4e0aba4f8b5d1235e7b473359732d00cdcd1b.tar
drakx-c0b4e0aba4f8b5d1235e7b473359732d00cdcd1b.tar.gz
drakx-c0b4e0aba4f8b5d1235e7b473359732d00cdcd1b.tar.bz2
drakx-c0b4e0aba4f8b5d1235e7b473359732d00cdcd1b.tar.xz
drakx-c0b4e0aba4f8b5d1235e7b473359732d00cdcd1b.zip
rename autologin field as user
-rw-r--r--perl-install/any.pm2
-rwxr-xr-xperl-install/standalone/drakboot8
-rwxr-xr-xperl-install/standalone/finish-install2
3 files changed, 6 insertions, 6 deletions
diff --git a/perl-install/any.pm b/perl-install/any.pm
index 7508039cd..03ebd3c76 100644
--- a/perl-install/any.pm
+++ b/perl-install/any.pm
@@ -667,7 +667,7 @@ sub get_autologin() {
$autologin_user = text2bool($conf{AUTOLOGIN}) && $conf{USER};
}
- { autologin => $autologin_user, desktop => $desktop, dm => $dm };
+ { user => $autologin_user, desktop => $desktop, dm => $dm };
}
sub set_autologin {
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;
}