summaryrefslogtreecommitdiffstats
path: root/perl-install
diff options
context:
space:
mode:
Diffstat (limited to 'perl-install')
-rw-r--r--perl-install/install_steps.pm5
-rw-r--r--perl-install/install_steps_interactive.pm1
2 files changed, 4 insertions, 2 deletions
diff --git a/perl-install/install_steps.pm b/perl-install/install_steps.pm
index b2051657c..3168c8025 100644
--- a/perl-install/install_steps.pm
+++ b/perl-install/install_steps.pm
@@ -296,7 +296,8 @@ sub installPackages($$) { #- complete REWORK, TODO and TOCHECK!
$o->{toSave} = [];
#- hack for compat-glibc to upgrade properly :-(
- if (pkgs::packageFlagSelected(pkgs::packageByName($packages, 'compat-glibc'))) {
+ if (pkgs::packageFlagSelected(pkgs::packageByName($packages, 'compat-glibc')) &&
+ !pkgs::packageFlagInstalled(pkgs::packageByName($packages, 'compat-glibc'))) {
rename "$o->{prefix}/usr/i386-glibc20-linux", "$o->{prefix}/usr/i386-glibc20-linux.mdkgisave";
}
}
@@ -961,7 +962,7 @@ sub downNetwork {
} elsif ($o->{modem} && $o->{modem}{isUp}) {
run_program::rooted($o->{prefix}, "ifdown", "ppp0");
run_program::rooted($o->{prefix}, "/etc/rc.d/init.d/syslog", "stop");
- eval { modules::unload($_) foreach qw(ppp serial) };
+ eval { modules::unload($_) foreach qw(ppp_deflate bsd_comp ppp serial) };
$o->{modem}{isUp} = 0;
} else {
$::testing or return;
diff --git a/perl-install/install_steps_interactive.pm b/perl-install/install_steps_interactive.pm
index 8da8c32b5..0ed7681a6 100644
--- a/perl-install/install_steps_interactive.pm
+++ b/perl-install/install_steps_interactive.pm
@@ -508,6 +508,7 @@ sub pppConfig {
my $m = $o->{modem} ||= {};
unless ($m->{device} || $::expert && !$o->ask_yesorno('', _("Try to find a modem?"), 1)) {
+ eval { modules::load("serial"); };
detect_devices::probeSerialDevices();
foreach (0..3) {
next if $o->{mouse}{device} =~ /ttyS$_/;