summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2002-12-02 17:54:56 +0000
committerPascal Rigaux <pixel@mandriva.com>2002-12-02 17:54:56 +0000
commit5ea5e381f9840d127fe444d8eecf34be4c45d0e6 (patch)
tree9b28145ab1da87d737416775ec3f73b0a1de260c
parentb2dd0fe8f3a0cca2f58deaa254d3639e88b7db29 (diff)
downloaddrakx-backup-do-not-use-5ea5e381f9840d127fe444d8eecf34be4c45d0e6.tar
drakx-backup-do-not-use-5ea5e381f9840d127fe444d8eecf34be4c45d0e6.tar.gz
drakx-backup-do-not-use-5ea5e381f9840d127fe444d8eecf34be4c45d0e6.tar.bz2
drakx-backup-do-not-use-5ea5e381f9840d127fe444d8eecf34be4c45d0e6.tar.xz
drakx-backup-do-not-use-5ea5e381f9840d127fe444d8eecf34be4c45d0e6.zip
any::get_autologin() doesnt modify $o, it returns a hash
-rw-r--r--perl-install/any.pm5
-rw-r--r--perl-install/install_steps_interactive.pm2
2 files changed, 3 insertions, 4 deletions
diff --git a/perl-install/any.pm b/perl-install/any.pm
index 3cded4dc1..511db03ba 100644
--- a/perl-install/any.pm
+++ b/perl-install/any.pm
@@ -360,9 +360,8 @@ sub pack_passwd {
sub get_autologin {
my ($o) = @_;
my %l = getVarsFromSh("$::prefix/etc/sysconfig/autologin");
- $o->{autologin} ||= text2bool($l{AUTOLOGIN}) && $l{USER};
- %l = getVarsFromSh("$::prefix/etc/sysconfig/desktop");
- $o->{desktop} ||= $l{DESKTOP};
+ my %desktop = getVarsFromSh("$::prefix/etc/sysconfig/desktop");
+ { autologin => text2bool($l{AUTOLOGIN}) && $l{USER}, desktop => $desktop{DESKTOP} };
}
sub set_autologin {
diff --git a/perl-install/install_steps_interactive.pm b/perl-install/install_steps_interactive.pm
index a2258f64c..7046e0d28 100644
--- a/perl-install/install_steps_interactive.pm
+++ b/perl-install/install_steps_interactive.pm
@@ -1159,7 +1159,7 @@ sub addUser {
if ($o->{security} >= 1 || $clicked) {
any::ask_users($o->{prefix}, $o, $o->{users}, $o->{security});
}
- any::get_autologin($o);
+ add2hash($o, any::get_autologin());
any::autologin($o, $o);
install_steps::addUser($o);