summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFlorin Grad <florin@mandriva.com>2003-03-11 17:02:01 +0000
committerFlorin Grad <florin@mandriva.com>2003-03-11 17:02:01 +0000
commit5ebd52730c3b7e1273b184a52b2f6409e3e60d4c (patch)
tree6a376329f01d1bf979d7d40f5b7b5edfca341b85
parent42d1d5e5bdf87b1956c22ee9fe72e4badae8b8b0 (diff)
downloaddrakx-5ebd52730c3b7e1273b184a52b2f6409e3e60d4c.tar
drakx-5ebd52730c3b7e1273b184a52b2f6409e3e60d4c.tar.gz
drakx-5ebd52730c3b7e1273b184a52b2f6409e3e60d4c.tar.bz2
drakx-5ebd52730c3b7e1273b184a52b2f6409e3e60d4c.tar.xz
drakx-5ebd52730c3b7e1273b184a52b2f6409e3e60d4c.zip
really use the chosen net_connect interface
-rwxr-xr-xperl-install/standalone/drakgw4
1 files changed, 2 insertions, 2 deletions
diff --git a/perl-install/standalone/drakgw b/perl-install/standalone/drakgw
index 3a3350874..c01b08882 100755
--- a/perl-install/standalone/drakgw
+++ b/perl-install/standalone/drakgw
@@ -261,7 +261,7 @@ my $start_range = network::network::read_dhcpd_conf()->{dynamic_bootp}[0] ||= "1
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";
+my $internal_domain_name = network::network::read_dhcpd_conf()->{domain_name}[0] ||= network::network::read_resolv_conf_raw()->{search}[0] ||= "homeland.net";
my $reconf_dhcp_server_intf = 1;
@@ -390,7 +390,7 @@ if (grep { !-e $rpm2file{$_} } keys %rpm2file) {
put_in_hash($shorewall ||= {}, {
disabled => 0,
net_interface => $card_netconnect,
- if_(@cards > 1, loc_interface => [ grep { $_ ne $device } @cards ]),
+ loc_interface => [ grep { $_ ne $device } @cards ],
masquerade => { interface => $device, subnet => "$lan_address.0/$netmask" },
});