summaryrefslogtreecommitdiffstats
path: root/perl-install/network/network.pm
diff options
context:
space:
mode:
authorOlivier Blin <oblin@mandriva.org>2005-08-08 15:19:14 +0000
committerOlivier Blin <oblin@mandriva.org>2005-08-08 15:19:14 +0000
commit8926342d37889e94301b731267492b34ae486547 (patch)
tree54666169f0268ac031c3f70f637d2e02fa5afad7 /perl-install/network/network.pm
parent0ee884c99168e3455d6d6d50aafb0db1874ef46c (diff)
downloaddrakx-8926342d37889e94301b731267492b34ae486547.tar
drakx-8926342d37889e94301b731267492b34ae486547.tar.gz
drakx-8926342d37889e94301b731267492b34ae486547.tar.bz2
drakx-8926342d37889e94301b731267492b34ae486547.tar.xz
drakx-8926342d37889e94301b731267492b34ae486547.zip
initial IPv6 support (6to4 tunnel)
Diffstat (limited to 'perl-install/network/network.pm')
-rw-r--r--perl-install/network/network.pm8
1 files changed, 6 insertions, 2 deletions
diff --git a/perl-install/network/network.pm b/perl-install/network/network.pm
index 321f61ec9..55b73f895 100644
--- a/perl-install/network/network.pm
+++ b/perl-install/network/network.pm
@@ -30,11 +30,12 @@ my $tmdns_file = "/etc/tmdns.conf";
#- network (/etc/sysconfig/network) : NETWORKING FORWARD_IPV4 NETWORKING_IPV6 HOSTNAME GATEWAY GATEWAYDEV NISDOMAIN
#- NETWORKING : networking flag : string : "yes" by default
#- FORWARD_IPV4 : forward IP flag : string : "false" by default
-#- NETWORKING_IPV6 : use IPv6, "yes" or "no"
#- HOSTNAME : hostname : string : "localhost.localdomain" by default
#- GATEWAY : gateway
#- GATEWAYDEV : gateway interface
#- NISDOMAIN : nis domain
+#- NETWORKING_IPV6 : use IPv6, "yes" or "no"
+#- IPV6_DEFAULTDEV
#- resolv (/etc/resolv.conf): dnsServer, dnsServer2, dnsServer3, DOMAINNAME, DOMAINNAME2, DOMAINNAME3
#- dnsServer : dns server 1
#- dnsServer2 : dns server 2
@@ -53,6 +54,8 @@ my $tmdns_file = "/etc/tmdns.conf";
#- NETMASK : netmask
#- DEVICE : device name
#- BOOTPROTO : boot prototype : "bootp" or "dhcp" or "pump" or ...
+#- IPV6INIT
+#- IPV6TO4INIT
sub read_conf {
my ($file) = @_;
@@ -97,7 +100,7 @@ sub write_network_conf {
}
$net->{network}{NETWORKING} = 'yes';
- setVarsInSh($::prefix . $network_file, $net->{network}, qw(HOSTNAME NETWORKING GATEWAY GATEWAYDEV NISDOMAIN FORWARD_IPV4 NETWORKING_IPV6));
+ setVarsInSh($::prefix . $network_file, $net->{network}, qw(HOSTNAME NETWORKING GATEWAY GATEWAYDEV NISDOMAIN FORWARD_IPV4 NETWORKING_IPV6 IPV6_DEFAULTDEV));
$net->{network}{HOSTNAME} && !$::isInstall and sethostname($net);
}
@@ -195,6 +198,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 ETHTOOL_OPTS VLAN MTU),
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),
+ qw(IPV6INIT IPV6TO4INIT),
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))
);