diff options
| author | Florent Villard <warly@mandriva.com> | 2003-03-08 16:39:21 +0000 |
|---|---|---|
| committer | Florent Villard <warly@mandriva.com> | 2003-03-08 16:39:21 +0000 |
| commit | 719e1ecbe634f0571263c02906703c40cc55a5fa (patch) | |
| tree | 3b830f28133146730832d9e1c90cd554c9e6e80c | |
| parent | 3048c35a18fbab378204525bcd249288b6ad8446 (diff) | |
| download | drakwizard-719e1ecbe634f0571263c02906703c40cc55a5fa.tar drakwizard-719e1ecbe634f0571263c02906703c40cc55a5fa.tar.gz drakwizard-719e1ecbe634f0571263c02906703c40cc55a5fa.tar.bz2 drakwizard-719e1ecbe634f0571263c02906703c40cc55a5fa.tar.xz drakwizard-719e1ecbe634f0571263c02906703c40cc55a5fa.zip | |
choose another dns than 127.0.0.1 if available for dhcp server
| -rw-r--r-- | dhcp_wizard/scripts/Dhcpconf.pm | 3 | ||||
| -rw-r--r-- | drakwizard.spec | 6 |
2 files changed, 8 insertions, 1 deletions
diff --git a/dhcp_wizard/scripts/Dhcpconf.pm b/dhcp_wizard/scripts/Dhcpconf.pm index 881ef56f..1f319eb5 100644 --- a/dhcp_wizard/scripts/Dhcpconf.pm +++ b/dhcp_wizard/scripts/Dhcpconf.pm @@ -75,6 +75,9 @@ sub do_it { my $wiz_host_name = $o->network_get("HOSTNAME"); 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 + } if (!$wiz_gateway) { my $t = `LC_ALL=C /sbin/ip route list scope global`; ($wiz_gateway) = $t =~ /default via (\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}) dev/; diff --git a/drakwizard.spec b/drakwizard.spec index 153cbf08..cfcf3578 100644 --- a/drakwizard.spec +++ b/drakwizard.spec @@ -1,5 +1,5 @@ %define name drakwizard -%define version 1.5 +%define version 1.6 %define release 1mdk Name: %{name} @@ -51,6 +51,10 @@ rm -rf $RPM_BUILD_DIR/$RPM_PACKAGE_NAME %_datadir/wizards* %changelog + +* 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 + * Wed Mar 05 2003 Warly <warly@mandrakesoft.com> 1.5-1mdk - remove firewall wizard - try to fix server wizard (unused anyway) |