diff options
| author | Florin Grad <florin@mandriva.com> | 2003-02-27 10:14:35 +0000 |
|---|---|---|
| committer | Florin Grad <florin@mandriva.com> | 2003-02-27 10:14:35 +0000 |
| commit | 161594e20a6ee7651747a8ac580fd32f231bbcf9 (patch) | |
| tree | e790efcb602efc8751e2a9dd101ea4e7770fb022 | |
| parent | e229f29cacf475d909fe51cc0de374d2f3260bbb (diff) | |
| download | drakx-161594e20a6ee7651747a8ac580fd32f231bbcf9.tar drakx-161594e20a6ee7651747a8ac580fd32f231bbcf9.tar.gz drakx-161594e20a6ee7651747a8ac580fd32f231bbcf9.tar.bz2 drakx-161594e20a6ee7651747a8ac580fd32f231bbcf9.tar.xz drakx-161594e20a6ee7651747a8ac580fd32f231bbcf9.zip | |
the function is called read_dhcpd_conf not read_dhcpd_conf_raw
| -rwxr-xr-x | perl-install/standalone/drakgw | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/perl-install/standalone/drakgw b/perl-install/standalone/drakgw index 84fdd5690..bba1b909b 100755 --- a/perl-install/standalone/drakgw +++ b/perl-install/standalone/drakgw @@ -242,18 +242,18 @@ log::explanations("Choosing network device: $device"); my $lan_address = $conf->{NETWORK} ||= "192.168.1.0"; my $server_ip = $conf->{IPADDR} ||= "192.168.1.1"; -my $nameserver_ip = network::network::read_dhcpd_conf_raw()->{domain_name_servers}[0] ||= "192.168.1.1"; -my $netmask = network::network::read_dhcpd_conf_raw()->{subnet_mask}[0] ||= "255.255.255.0"; -my $start_range = network::network::read_dhcpd_conf_raw()->{dynamic_bootp}[0] ||= "16"; -my $end_range = network::network::read_dhcpd_conf_raw()->{dynamic_bootp}[1] ||= "253"; -my $default_lease = network::network::read_dhcpd_conf_raw()->{max_lease_time}[0] ||= "21600"; -my $max_lease = network::network::read_dhcpd_conf_raw()->{default_lease_time}[0] ||= "43200"; -my $internal_domain_name = network::network::read_dhcpd_conf_raw()->{domain_name}[0] ||= network::network::read_resolv_conf_raw()->{nameserver}[0] ||= "homeland.net"; +my $nameserver_ip = network::network::read_dhcpd_conf()->{domain_name_servers}[0] ||= "192.168.1.1"; +my $netmask = network::network::read_dhcpd_conf()->{subnet_mask}[0] ||= "255.255.255.0"; +my $start_range = network::network::read_dhcpd_conf()->{dynamic_bootp}[0] ||= "16"; +my $end_range = network::network::read_dhcpd_conf()->{dynamic_bootp}[1] ||= "253"; +my $default_lease = network::network::read_dhcpd_conf()->{max_lease_time}[0] ||= "21600"; +my $max_lease = network::network::read_dhcpd_conf()->{default_lease_time}[0] ||= "43200"; +my $internal_domain_name = network::network::read_dhcpd_conf()->{domain_name}[0] ||= network::network::read_resolv_conf_raw()->{nameserver}[0] ||= "homeland.net"; #use Data::Dumper; #print Dumper(network::network::read_resolv_conf_raw()->{nameserver})."\n"; #print network::network::read_resolv_conf_raw()->{nameserver}[0]."\n"; -#print Dumper(network::network::read_dhcpd_conf_raw())."\n"; +#print Dumper(network::network::read_dhcpd_conf())."\n"; my $reconf_dhcp_server_intf = 1; @@ -281,7 +281,7 @@ Driver: %s", $device, $conf->{NETWORK}, $conf->{IPADDR}, $conf->{BOOTPROTO}, $al if ($auto ne N("Yes")) { $reconf_dhcp_server_intf = 0; $server_ip = $conf->{IPADDR}; - $nameserver_ip = network::network::read_dhcpd_conf_raw()->{domain_name_servers}[0] ||= $conf->{IPADDR}; + $nameserver_ip = network::network::read_dhcpd_conf()->{domain_name_servers}[0] ||= $conf->{IPADDR}; $lan_address = $conf->{NETWORK}; $in->ask_from('', N("I can keep your current configuration and assume you already set up a DHCP server; in that case please verify I correctly read the Network that you use for your local network; I will not reconfigure it and I will not touch your DHCP server configuration. |