From d758ad8cac9c00c70cfe4dd459bf7e87c268c579 Mon Sep 17 00:00:00 2001 From: Ted Lemon Date: Wed, 27 Jun 2001 00:31:20 +0000 Subject: Merge changes between 3.0rc7 and 3.0rc8pl2. --- client/scripts/openbsd | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) (limited to 'client/scripts/openbsd') diff --git a/client/scripts/openbsd b/client/scripts/openbsd index 13be7008..d076d92d 100644 --- a/client/scripts/openbsd +++ b/client/scripts/openbsd @@ -1,10 +1,12 @@ #!/bin/sh make_resolv_conf() { - echo search $new_domain_name >/etc/resolv.conf - for nameserver in $new_domain_name_servers; do - echo nameserver $nameserver >>/etc/resolv.conf - done + if [ "x$new_domain_name" != x ] && [ x"$new_domain_name_servers" != x ]; then + echo search $new_domain_name >/etc/resolv.conf + for nameserver in $new_domain_name_servers; do + echo nameserver $nameserver >>/etc/resolv.conf + done + fi } # Must be used on exit. Invokes the local dhcp client exit hooks, if any. @@ -127,7 +129,8 @@ if [ x$reason = xBOUND ] || [ x$reason = xRENEW ] || \ exit_with_hooks 0 fi -if [ x$reason = xEXPIRE ] || [ x$reason = xFAIL ]; then +if [ x$reason = xEXPIRE ] || [ x$reason = xFAIL ] || [ x$reason = xRELEASE ] \ + || [ x$reason = xSTOP ]; then if [ x$alias_ip_address != x ]; then ifconfig $interface inet -alias $alias_ip_address > /dev/null 2>&1 route delete $alias_ip_address 127.0.0.1 > /dev/null 2>&1 -- cgit v1.2.1