summaryrefslogtreecommitdiffstats
path: root/perl-install
diff options
context:
space:
mode:
authordamien <damien@mandriva.com>2001-09-14 15:42:54 +0000
committerdamien <damien@mandriva.com>2001-09-14 15:42:54 +0000
commit0676c599462c2627653a33a4704aa786eb273b3a (patch)
treeabdea661f607b6763c0b2952516f7571566ae044 /perl-install
parentea9c3745c624d7385fb84ee18fc896b3721bff37 (diff)
downloaddrakx-0676c599462c2627653a33a4704aa786eb273b3a.tar
drakx-0676c599462c2627653a33a4704aa786eb273b3a.tar.gz
drakx-0676c599462c2627653a33a4704aa786eb273b3a.tar.bz2
drakx-0676c599462c2627653a33a4704aa786eb273b3a.tar.xz
drakx-0676c599462c2627653a33a4704aa786eb273b3a.zip
bugfix
Diffstat (limited to 'perl-install')
-rw-r--r--perl-install/bootlook.pm2
-rw-r--r--perl-install/network/adsl.pm3
2 files changed, 3 insertions, 2 deletions
diff --git a/perl-install/bootlook.pm b/perl-install/bootlook.pm
index cbad70b79..d5b90cfc9 100644
--- a/perl-install/bootlook.pm
+++ b/perl-install/bootlook.pm
@@ -280,7 +280,7 @@ sub isAutologin {
chomp ($line);
$line = ($line eq "yes");
my %au = get_autologin('');
- return ($line && $au{autologin} && $au{desktop});
+ return ($line && defined $au{autologin});
}
sub get_autologin {
diff --git a/perl-install/network/adsl.pm b/perl-install/network/adsl.pm
index 3c6e7092d..a5a8adcbf 100644
--- a/perl-install/network/adsl.pm
+++ b/perl-install/network/adsl.pm
@@ -138,9 +138,10 @@ user "$adsl->{login}"
['ppp-compress-26', 'ppp_deflate']);
$::isStandalone and modules::write_conf($prefix);
my $mgmtrpm;
- if($::isStandalone) {
+ if ($::isStandalone) {
$mgmtrpm = `grep speedtouch_mgmt /var/lib/urpmi/depslist.ordered` ? 1 : 0;
} else {
+ require pkgs;
$mgmtrpm = pkgs::packageByName($in->{package}, "speedtouch_mgmt");
}
$mgmtrpm ? $in->do_pkgs->install('speedtouch_mgmt') : $in->ask_warn('', _('You need the alcatel microcode.