summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tvignaud@mandriva.org>2003-11-12 17:00:59 +0000
committerThierry Vignaud <tvignaud@mandriva.org>2003-11-12 17:00:59 +0000
commit152395f8957bc3dfa9f62ba87a1c779f7d4f14f7 (patch)
tree493f7462b8fb9c1b07f59591ff5fa39376f2797f
parentd8243dbd8e2698d34a4f42312f6680f34acadce4 (diff)
downloaddrakx-152395f8957bc3dfa9f62ba87a1c779f7d4f14f7.tar
drakx-152395f8957bc3dfa9f62ba87a1c779f7d4f14f7.tar.gz
drakx-152395f8957bc3dfa9f62ba87a1c779f7d4f14f7.tar.bz2
drakx-152395f8957bc3dfa9f62ba87a1c779f7d4f14f7.tar.xz
drakx-152395f8957bc3dfa9f62ba87a1c779f7d4f14f7.zip
forward program logic fix: write up/down programs for adsl speedtouch
even if firmware is already there or if one say "let see this later" which result in up/down scripts to be removed on drakconnect startup
-rw-r--r--perl-install/network/adsl.pm3
1 files changed, 2 insertions, 1 deletions
diff --git a/perl-install/network/adsl.pm b/perl-install/network/adsl.pm
index 372504570..32b40a822 100644
--- a/perl-install/network/adsl.pm
+++ b/perl-install/network/adsl.pm
@@ -208,7 +208,7 @@ user "$adsl->{login}"
['ppp-compress-26', 'ppp_deflate'];
$::isStandalone and modules::write_conf($prefix);
$in->do_pkgs->what_provides("speedtouch_mgmt") and $in->do_pkgs->install('speedtouch_mgmt');
- -e "$prefix/usr/share/speedtouch/mgmt.o" and return 1;
+ -e "$prefix/usr/share/speedtouch/mgmt.o" and goto end_firmware;
firmware:
@@ -231,6 +231,7 @@ Download it at:
and copy the mgmt.o in /usr/share/speedtouch", 'http://prdownloads.sourceforge.net/speedtouch/speedtouch-20011007.tar.bz2'));
-e "$destination/alcaudsl.sys" and rename "$destination/alcaudsl.sys", "$destination/mgmt.o";
+ end_firmware:
}
if ($adsl_type eq 'eci') {