summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tvignaud@mandriva.org>2003-11-12 16:59:32 +0000
committerThierry Vignaud <tvignaud@mandriva.org>2003-11-12 16:59:32 +0000
commitbe0d9de1a76910011ab288f6d5552f64b6160ede (patch)
tree87919d61a618902407f9561fdec054063b33ad1b
parente8568e7ca9e829c77f6510b8481d132804a7933f (diff)
downloaddrakx-backup-do-not-use-be0d9de1a76910011ab288f6d5552f64b6160ede.tar
drakx-backup-do-not-use-be0d9de1a76910011ab288f6d5552f64b6160ede.tar.gz
drakx-backup-do-not-use-be0d9de1a76910011ab288f6d5552f64b6160ede.tar.bz2
drakx-backup-do-not-use-be0d9de1a76910011ab288f6d5552f64b6160ede.tar.xz
drakx-backup-do-not-use-be0d9de1a76910011ab288f6d5552f64b6160ede.zip
fix program logic: 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 1118c2083..724ed708c 100644
--- a/perl-install/network/adsl.pm
+++ b/perl-install/network/adsl.pm
@@ -206,7 +206,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:
@@ -229,6 +229,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') {