summaryrefslogtreecommitdiffstats
path: root/perl-install/network
diff options
context:
space:
mode:
Diffstat (limited to 'perl-install/network')
-rw-r--r--perl-install/network/adsl.pm8
-rw-r--r--perl-install/network/isdn.pm3
2 files changed, 5 insertions, 6 deletions
diff --git a/perl-install/network/adsl.pm b/perl-install/network/adsl.pm
index 893a9955b..d7605a90e 100644
--- a/perl-install/network/adsl.pm
+++ b/perl-install/network/adsl.pm
@@ -161,11 +161,11 @@ user "$adsl->{login}"
}
if ($adsl_type eq 'speedtouch') {
- $netc->{vpivci} =~ /(\d+)_(\d+)/;
+ my ($vpi, $vci) = $netc->{vpivci} =~ /(\d+)_(\d+)/ or return;
output("$prefix/etc/ppp/peers/adsl",
qq(noauth
noipdefault
-pty "/usr/sbin/pppoa3 -c -vpi $1 -vci $2"
+pty "/usr/sbin/pppoa3 -c -vpi $vpi -vci $vci"
sync
kdebug 1
noaccomp
@@ -195,13 +195,13 @@ and copy the mgmt.o in /usr/share/speedtouch"));
}
if ($adsl_type eq 'eci') {
- $netc->{vpivci} =~ /(\d+)_(\d+)/;
+ my ($vpi, $vci) = $netc->{vpivci} =~ /(\d+)_(\d+)/ or return;
output("$prefix/etc/ppp/peers/adsl",
qq(debug
kdebug 1
noipdefault
defaultroute
-pty "/usr/bin/pppoeci -v 1 -vpi $1 -vci $2"
+pty "/usr/bin/pppoeci -v 1 -vpi $vpi -vci $vci"
sync
noaccomp
nopcomp
diff --git a/perl-install/network/isdn.pm b/perl-install/network/isdn.pm
index 0028ecce7..b3da0ff16 100644
--- a/perl-install/network/isdn.pm
+++ b/perl-install/network/isdn.pm
@@ -159,8 +159,7 @@ sub isdn_read_config {
$isdn->{driver} = $c->{ippp0}{alias};
#- 'type' 'protocol' 'mem' 'io' 'io0' 'io1' 'irq' 'id'
foreach (split(' ', $c->{$isdn->{driver}}{options})) {
- /(.*)=(.*)/;
- $isdn->{$1} = $2;
+ $isdn->{$1} = $2 if /(.*)=(.*)/;
}
foreach my $f ('ioptions1B', 'ioptions2B') {
foreach (cat_("$prefix/etc/ppp/$f")) {