From 5ea5e381f9840d127fe444d8eecf34be4c45d0e6 Mon Sep 17 00:00:00 2001 From: Pascal Rigaux Date: Mon, 2 Dec 2002 17:54:56 +0000 Subject: any::get_autologin() doesnt modify $o, it returns a hash --- perl-install/any.pm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'perl-install/any.pm') 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 { -- cgit v1.2.1