diff options
| author | Olivier Blin <oblin@mandriva.org> | 2005-05-13 09:43:55 +0000 |
|---|---|---|
| committer | Olivier Blin <oblin@mandriva.org> | 2005-05-13 09:43:55 +0000 |
| commit | 69705571009c7740c0ff89c837873ab035d03059 (patch) | |
| tree | 8c93f117d950e433b03c6b783c48bdcc0b114749 /perl-install/network/network.pm | |
| parent | dbfb323659ad997d54aacde9ac606c3613caceba (diff) | |
| download | drakx-69705571009c7740c0ff89c837873ab035d03059.tar drakx-69705571009c7740c0ff89c837873ab035d03059.tar.gz drakx-69705571009c7740c0ff89c837873ab035d03059.tar.bz2 drakx-69705571009c7740c0ff89c837873ab035d03059.tar.xz drakx-69705571009c7740c0ff89c837873ab035d03059.zip | |
DVB support
Diffstat (limited to 'perl-install/network/network.pm')
| -rw-r--r-- | perl-install/network/network.pm | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/perl-install/network/network.pm b/perl-install/network/network.pm index 500bea186..50411ca1f 100644 --- a/perl-install/network/network.pm +++ b/perl-install/network/network.pm @@ -160,6 +160,7 @@ sub write_interface_conf { setVarsInSh($file, $intf, qw(DEVICE BOOTPROTO IPADDR NETMASK NETWORK BROADCAST ONBOOT HWADDR METRIC MII_NOT_SUPPORTED TYPE USERCTL ATM_ADDR), qw(WIRELESS_MODE WIRELESS_ESSID WIRELESS_NWID WIRELESS_FREQ WIRELESS_SENS WIRELESS_RATE WIRELESS_ENC_KEY WIRELESS_RTS WIRELESS_FRAG WIRELESS_IWCONFIG WIRELESS_IWSPY WIRELESS_IWPRIV WIRELESS_WPA_DRIVER), + qw(DVB_ADAPTER_ID DVB_NETWORK_DEMUX DVB_NETWORK_PID), if_($intf->{BOOTPROTO} eq "dhcp", qw(DHCP_CLIENT DHCP_HOSTNAME NEEDHOSTNAME PEERDNS PEERYP PEERNTPD DHCP_TIMEOUT)), if_($intf->{DEVICE} =~ /^ippp\d+$/, qw(DIAL_ON_IFUP)) ); @@ -416,7 +417,7 @@ sub read_all_conf { add2hash($netc, read_resolv_conf()); add2hash($netc, read_tmdns_conf()); foreach (all("$::prefix/etc/sysconfig/network-scripts")) { - my ($device) = /^ifcfg-([A-Za-z0-9.:]+)$/; + my ($device) = /^ifcfg-([A-Za-z0-9.:_-]+)$/; next if $device =~ /.rpmnew$|.rpmsave$/; if ($device && $device ne 'lo') { my $intf = findIntf($intf, $device); |