summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFlorent Villard <warly@mandriva.com>2003-03-09 07:10:43 +0000
committerFlorent Villard <warly@mandriva.com>2003-03-09 07:10:43 +0000
commit2632a8bfd6bd668f1b5e4dadc22015cc0cdec9ce (patch)
treec3a1446a1b903deb9d01ee4cbefcc32c97a56b90
parent719e1ecbe634f0571263c02906703c40cc55a5fa (diff)
downloaddrakwizard-2632a8bfd6bd668f1b5e4dadc22015cc0cdec9ce.tar
drakwizard-2632a8bfd6bd668f1b5e4dadc22015cc0cdec9ce.tar.gz
drakwizard-2632a8bfd6bd668f1b5e4dadc22015cc0cdec9ce.tar.bz2
drakwizard-2632a8bfd6bd668f1b5e4dadc22015cc0cdec9ce.tar.xz
drakwizard-2632a8bfd6bd668f1b5e4dadc22015cc0cdec9ce.zip
send the servier IP in dhcp wizard if 127.0.0.1 is its nameserver
-rw-r--r--dhcp_wizard/scripts/Dhcpconf.pm2
-rw-r--r--drakwizard.spec4
2 files changed, 4 insertions, 2 deletions
diff --git a/dhcp_wizard/scripts/Dhcpconf.pm b/dhcp_wizard/scripts/Dhcpconf.pm
index 1f319eb5..ea06660e 100644
--- a/dhcp_wizard/scripts/Dhcpconf.pm
+++ b/dhcp_wizard/scripts/Dhcpconf.pm
@@ -76,7 +76,7 @@ sub do_it {
my $wiz_gateway = $o->network_get("GATEWAY");
my $wiz_dns = $o->network_get("dnsServer");
if ($wiz_dns eq '127.0.0.1') {
- $wiz_dns = $o->network_get("dnsServer2") || $wiz_dns
+ $wiz_dns = $wiz_ip_server
}
if (!$wiz_gateway) {
my $t = `LC_ALL=C /sbin/ip route list scope global`;
diff --git a/drakwizard.spec b/drakwizard.spec
index cfcf3578..eafacc6c 100644
--- a/drakwizard.spec
+++ b/drakwizard.spec
@@ -1,5 +1,5 @@
%define name drakwizard
-%define version 1.6
+%define version 1.7
%define release 1mdk
Name: %{name}
@@ -51,6 +51,8 @@ rm -rf $RPM_BUILD_DIR/$RPM_PACKAGE_NAME
%_datadir/wizards*
%changelog
+* Sun Mar 09 2003 Warly <warly@mandrakesoft.com>
+- set server ip as dns if 127.0.0.1 is the server nameserver
* Sat Mar 08 2003 Warly <warly@mandrakesoft.com> 1.6-1mdk
- do not choose 127.0.0.1 in dhcp server wizard if another dns is available