summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOlivier Blin <oblin@mandriva.org>2005-09-16 16:47:51 +0000
committerOlivier Blin <oblin@mandriva.org>2005-09-16 16:47:51 +0000
commit07fc0c8fd2124baddaab7997c58fcf7ac9801312 (patch)
tree1a369338b0413022d921582a7cf2f45cbcfa92a3
parent4322a104150d567dc0710be2bd6ad25a860f2f92 (diff)
downloaddrakx-07fc0c8fd2124baddaab7997c58fcf7ac9801312.tar
drakx-07fc0c8fd2124baddaab7997c58fcf7ac9801312.tar.gz
drakx-07fc0c8fd2124baddaab7997c58fcf7ac9801312.tar.bz2
drakx-07fc0c8fd2124baddaab7997c58fcf7ac9801312.tar.xz
drakx-07fc0c8fd2124baddaab7997c58fcf7ac9801312.zip
some modem configuration programs modify modprobe.conf while drakconnect/the installer is loaded, workaround it
-rw-r--r--perl-install/network/netconnect.pm9
1 files changed, 7 insertions, 2 deletions
diff --git a/perl-install/network/netconnect.pm b/perl-install/network/netconnect.pm
index 23bc560b9..add23dbf3 100644
--- a/perl-install/network/netconnect.pm
+++ b/perl-install/network/netconnect.pm
@@ -482,8 +482,13 @@ Take a look at http://www.linmodems.org"),
list => [ keys %{$net->{autodetect}{modem}}, N("Manual choice") ], } ];
},
complete => sub {
- my $driver = $net->{autodetect}{modem}{$modem_name}{driver} or return 0;
- !network::thirdparty::setup_device($in, 'rtc', $driver, $modem, qw(device));
+ my $driver = $net->{autodetect}{modem}{$modem_name}{driver} or return 0;
+ #- some modem configuration programs modify modprobe.conf while we're loaded
+ #- so write it now and reload then
+ $modules_conf->write;
+ my $ret = network::thirdparty::setup_device($in, 'rtc', $driver, $modem, qw(device));
+ $modules_conf->read if $ret;
+ !$ret;
},
post => sub {
return 'choose_serial_port' if $modem_name eq N("Manual choice");