diff options
| author | Mohit Mehta <mohit.mehta@vyatta.com> | 2009-09-11 18:02:51 -0700 |
|---|---|---|
| committer | Mohit Mehta <mohit.mehta@vyatta.com> | 2009-09-11 18:02:51 -0700 |
| commit | 9ff4fc00a4e92b23fe42e36f4cf3d1758ee1cb24 (patch) | |
| tree | 5cef011a2ded6a368102a9af250a8bd9be78bac4 /scripts/dns-forwarding | |
| parent | 7d9328fe647d3db88d03f8c657626997589d7b33 (diff) | |
| download | vyatta-cfg-system-9ff4fc00a4e92b23fe42e36f4cf3d1758ee1cb24.tar.gz vyatta-cfg-system-9ff4fc00a4e92b23fe42e36f4cf3d1758ee1cb24.zip | |
Fix Bug 4919 "service dns" branch of configuration file missing ...
* modify code to comply with Jenner change in is_dhcp_enabled()
Diffstat (limited to 'scripts/dns-forwarding')
| -rw-r--r-- | scripts/dns-forwarding/vyatta-dns-forwarding.pl | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/scripts/dns-forwarding/vyatta-dns-forwarding.pl b/scripts/dns-forwarding/vyatta-dns-forwarding.pl index d8552bd4..0caf8371 100644 --- a/scripts/dns-forwarding/vyatta-dns-forwarding.pl +++ b/scripts/dns-forwarding/vyatta-dns-forwarding.pl @@ -167,10 +167,8 @@ sub check_dhcp_interface { my $interface = shift; - if (!Vyatta::Misc::is_dhcp_enabled($interface)) { - print "DNS forwarding error: $interface is not using DHCP to get an IP address\n"; - return 0; - } + die "DNS forwarding error: $interface is not using DHCP to get an IP address\n" + unless Vyatta::Misc::is_dhcp_enabled($interface); if (-e "/var/run/vyatta/dhclient/dhclient_release_$interface") { # dhcp released for the interface |