diff options
| author | Thierry Vignaud <tvignaud@mandriva.org> | 2003-12-01 10:03:59 +0000 |
|---|---|---|
| committer | Thierry Vignaud <tvignaud@mandriva.org> | 2003-12-01 10:03:59 +0000 |
| commit | e08fc24a9c0a5df70e48e28c47c048bdc589cc86 (patch) | |
| tree | 88c320a03e22fa2d5e7a4c54a89a641a738f04cf /perl-install/network | |
| parent | 4c42dbbbb7eec9d1f1d965e57d857226ec6fdf85 (diff) | |
| download | drakx-e08fc24a9c0a5df70e48e28c47c048bdc589cc86.tar drakx-e08fc24a9c0a5df70e48e28c47c048bdc589cc86.tar.gz drakx-e08fc24a9c0a5df70e48e28c47c048bdc589cc86.tar.bz2 drakx-e08fc24a9c0a5df70e48e28c47c048bdc589cc86.tar.xz drakx-e08fc24a9c0a5df70e48e28c47c048bdc589cc86.zip | |
(configure) prevent silently skipping configuration steps by
explicitely dying
Diffstat (limited to 'perl-install/network')
| -rw-r--r-- | perl-install/network/adsl.pm | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/perl-install/network/adsl.pm b/perl-install/network/adsl.pm index 41d362ced..191e81ea9 100644 --- a/perl-install/network/adsl.pm +++ b/perl-install/network/adsl.pm @@ -36,25 +36,21 @@ If you don't know, choose 'use pppoe'"), $in->do_pkgs->install("rp-$type") if !$::testing; $netcnx->{type} = "adsl_$type"; adsl_conf($netcnx->{"adsl_$type"}, $netc, $intf, $type) or goto conf_adsl_step1; - } - if ($type eq 'dhcp') { + } elsif ($type eq 'dhcp') { $in->do_pkgs->install(qw(dhcpcd)) if !$::testing; go_ethernet($netc, $intf, 'dhcp', '', '', $first_time) or goto conf_adsl_step1; - } - if ($type eq 'pptp') { + } elsif ($type eq 'pptp') { $in->do_pkgs->install(qw(pptp-adsl)) if !$::testing; $netcnx->{type} = "adsl_$type"; $netcnx->{"adsl_$type"} = {}; adsl_conf($netcnx->{"adsl_$type"}, $netc, $intf, $type) or goto conf_adsl_step1; - } - if ($type =~ /sagem/) { + } elsif ($type =~ /sagem/) { $type = 'sagem' . ($type =~ /dhcp/ ? "_dhcp" : ""); $in->do_pkgs->install(qw(adiusbadsl), if_($type =~ /dhcp/, qw(dhcpcd))) if !$::testing; $netcnx->{type} = "adsl_$type"; $netcnx->{"adsl_$type"} = {}; adsl_conf($netcnx->{"adsl_$type"}, $netc, $intf, $type) or goto conf_adsl_step1; - } - if ($type =~ /speedtouch/) { + } elsif ($type =~ /speedtouch/) { $type = 'speedtouch'; $in->do_pkgs->install(qw(speedtouch)) if !$::testing; $netcnx->{type} = "adsl_$type"; @@ -62,7 +58,7 @@ If you don't know, choose 'use pppoe'"), $netcnx->{"adsl_$type"}{vpivci} = ''; adsl_conf($netcnx->{"adsl_$type"}, $netc, $intf, $type) or goto conf_adsl_step1; } - # if ($type =~ /ECI/) { + # elsif ($type =~ /ECI/) { # $type = 'eci'; # $in->do_pkgs->install(qw(eciadsl)) if !$::testing; # $netcnx->{type} = "adsl_$type"; @@ -70,6 +66,9 @@ If you don't know, choose 'use pppoe'"), # $netcnx->{"adsl_$type"}{vpivci} = ''; # adsl_conf($netcnx->{"adsl_$type"}, $netc, $intf, $type) or goto conf_adsl_step1; # } + else { + die "unknown adsl connection type !!!"; + } $type =~ /speedtouch|eci/ or $netconnect::need_restart_network = 1; 1; } |