From 3f9f949de684edadf0e8a4996512188b7eecf6cf Mon Sep 17 00:00:00 2001
From: des <des@FreeBSD.org>
Date: Mon, 29 Mar 2004 20:00:54 +0000
Subject: Fix the case where $ntpdate_hosts was not specified and /etc/ntp.conf
 does not exist.

Submitted by:	ru
---
 etc/rc.d/ntpdate | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'etc')

diff --git a/etc/rc.d/ntpdate b/etc/rc.d/ntpdate
index b2f4055..1ef9b61 100755
--- a/etc/rc.d/ntpdate
+++ b/etc/rc.d/ntpdate
@@ -17,13 +17,13 @@ start_cmd="ntpdate_start"
 
 ntpdate_start()
 {
-	if [ -z "$ntpdate_hosts" ]; then
+	if [ -z "$ntpdate_hosts" -a -f /etc/ntp.conf ]; then
 		ntpdate_hosts=`awk '
 			/^server[ \t]*127.127/      {next}
 			/^(server|peer)/            {print $2}
 		' </etc/ntp.conf`
 	fi
-	if [ -n "$ntpdate_hosts"  ]; then
+	if [ -n "$ntpdate_hosts" -o -n "$rc_flags" ]; then
 		echo "Setting date via ntp."
 		${ntpdate_command:-ntpdate} $rc_flags $ntpdate_hosts
 	fi
-- 
cgit v1.1