diff options
| -rw-r--r-- | perl-install/network/ethernet.pm | 8 | ||||
| -rw-r--r-- | perl-install/network/isdn_consts.pm | 5 | ||||
| -rw-r--r-- | perl-install/network/netconnect.pm | 9 |
3 files changed, 13 insertions, 9 deletions
diff --git a/perl-install/network/ethernet.pm b/perl-install/network/ethernet.pm index f4e81c512..a6e6b0b64 100644 --- a/perl-install/network/ethernet.pm +++ b/perl-install/network/ethernet.pm @@ -87,7 +87,7 @@ sub conf_network_card { my ($netc, $intf, $type, $ipadr, $netadr) = @_; #-type =static or dhcp any::setup_thiskind($in, 'net', !$::expert, 1); - my @all_cards=conf_network_card_backend($prefix, $netc, $intf, $type, undef, $ipadr, $netadr); + my @all_cards=conf_network_card_backend($netc, $intf, $type, undef, $ipadr, $netadr); my $interface; @all_cards == () and $in->ask_warn('', _("No ethernet network adapter has been detected on your system. I cannot set up this connection type.")) and return; @@ -101,7 +101,7 @@ I cannot set up this connection type.")) and return; l1: $::isStandalone and modules::write_conf($prefix); - my $device=conf_network_card_backend($prefix, $netc, $intf, $type, $interface, $ipadr, $netadr, $interface); + my $device=conf_network_card_backend($netc, $intf, $type, $interface, $ipadr, $netadr, $interface); if ( $::isStandalone and !($type eq "dhcp")) { $in->ask_yesorno(_("Network interface"), _("I'm about to restart the network device:\n") . $device . _("\nDo you agree?"), 1) and configureNetwork2($in, $prefix, $netc, $intf) and system("$prefix/sbin/ifdown $device;$prefix/sbin/ifup $device"); @@ -132,7 +132,7 @@ I cannot set up this connection type.")) and return; #- $all_cards : a list of a list ( [eth1, module1], ... , [ethn, modulen]). Pass the ethx as $interface in further call. #- $device : only returned in case $interface was given it's $interface, but filtered by /eth[0-9+]/ : string : /eth[0-9+]/ sub conf_network_card_backend { - my ($prefix, $netc, $intf, $type, $interface, $ipadr, $netadr) = @_; + my ($netc, $intf, $type, $interface, $ipadr, $netadr) = @_; #-type =static or dhcp if (!$interface) { my @all_cards = detect_devices::getNet(); @@ -192,7 +192,7 @@ sub configureNetwork { local $_; any::setup_thiskind($in, 'net', !$::expert, 1); my @l = detect_devices::getNet() or die _("no network card found"); - my @all_cards = network::ethernet::conf_network_card_backend ($prefix, $netc, $intf, undef, undef, undef, undef); + my @all_cards = conf_network_card_backend ($netc, $intf, undef, undef, undef, undef); configureNetwork_step_1: my $n_card=0; diff --git a/perl-install/network/isdn_consts.pm b/perl-install/network/isdn_consts.pm index 09c52139f..990801603 100644 --- a/perl-install/network/isdn_consts.pm +++ b/perl-install/network/isdn_consts.pm @@ -169,6 +169,11 @@ package network::isdn; # $Id$ io => '0xd80', card => 'isa', }, + {description => "Sedlbauer Speed Fax+ (PCI)", #28 no parameter + driver => 'hisax', + type => '28', + card => 'pci', + }, {description => "USR Sportster internal (ISA)", #16 irq, io driver => 'hisax', type => '16', diff --git a/perl-install/network/netconnect.pm b/perl-install/network/netconnect.pm index 5d39df4c1..6fa750929 100644 --- a/perl-install/network/netconnect.pm +++ b/perl-install/network/netconnect.pm @@ -70,7 +70,7 @@ sub detect { any::setup_thiskind_backend('net', undef); require network::ethernet; network::ethernet->import; - my @all_cards = conf_network_card_backend ('', undef, undef, undef, undef, undef, undef); + my @all_cards = conf_network_card_backend (undef, undef, undef, undef, undef, undef); require network::adsl; network::adsl->import; map { @@ -93,7 +93,7 @@ sub main { connect_prog => "/etc/sysconfig/network-scripts/net_cnx_pg" ); $netc->{minus_one}=0; #When one configure an eth in dhcp without gateway $::isInstall and $in->set_help('configureNetwork'); - $::isStandalone and read_net_conf($netcnx, $netc); # REDONDANCE with intro. FIXME + $::isStandalone and read_net_conf($prefix, $netcnx, $netc); # REDONDANCE with intro. FIXME $netc->{NET_DEVICE}=$netcnx->{NET_DEVICE} if $netcnx->{NET_DEVICE}; # REDONDANCE with read_conf. FIXME $netc->{NET_INTERFACE}=$netcnx->{NET_INTERFACE} if $netcnx->{NET_INTERFACE}; # REDONDANCE with read_conf. FIXME network::read_all_conf($prefix, $netc ||= {}, $intf ||= {}); @@ -266,7 +266,7 @@ sub save_conf { any::setup_thiskind_backend('net', undef); require network::ethernet; network::ethernet->import; - my @all_cards = conf_network_card_backend ($prefix, $netc, $intf, undef, undef, undef, undef); + my @all_cards = conf_network_card_backend ($netc, $intf, undef, undef, undef, undef); $intf = { %$intf }; @@ -376,7 +376,7 @@ sub del_profile { $profile eq "default" and return; print "deleting $profile\n"; commands::rm("-f", "$prefix/etc/sysconfig/network-scripts/draknet_conf." . $profile); - commands::rm("-f", "$prefix/etc/sysconfig/network-scripts/net_{up,down,prog}." . $profile); + commands::rm("-f", glob_("$prefix/etc/sysconfig/network-scripts/net_{up,down,prog}." . $profile)); } sub add_profile { @@ -489,7 +489,6 @@ sub read_net_conf { my ($prefix, $netcnx, $netc)=@_; add2hash($netcnx, { getVarsFromSh("$prefix/etc/sysconfig/draknet") }); $netc->{$_} = $netcnx->{$_} foreach 'NET_DEVICE', 'NET_INTERFACE'; -#- print "type : $netcnx->{type}\n device : $netcnx->{NET_DEVICE}\n interface : $netcnx->{NET_INTERFACE}\n"; $netcnx->{$netcnx->{type}}||={}; add2hash($netcnx->{$netcnx->{type}}, { getVarsFromSh("$prefix/etc/sysconfig/draknet." . $netcnx->{type}) }); } |