[pkg-ntp-maintainers] Bug#388032: /etc/default/ntpdate should check the existence of /etc/ntp.conf

[Takeshi HAMASAKI]

Package: ntpdate
Version: 1:4.2.2+dfsg.2-2
Followup-For: Bug #388032

I made a patch to let /etc/default/ntpdate check the existence of /etc/ntp.conf .
It is attached to this report.

-- System Information:
Debian Release: testing/unstable
  APT prefers unstable
  APT policy: (500, 'unstable'), (500, 'testing'), (500, 'stable')
Architecture: i386 (i686)
Shell:  /bin/sh linked to /bin/bash
Kernel: Linux 2.6.17
Locale: LANG=ja_JP.eucJP, LC_CTYPE=ja_JP.eucJP (charmap=EUC-JP) (ignored: LC_ALL set to ja_JP.eucJP)

Versions of packages ntpdate depends on:
ii  libc6                         2.3.6-18   GNU C Library: Shared libraries
ii  libcap1                       1:1.10-14  support for getting/setting POSIX.
ii  libssl0.9.8                   0.9.8b-2   SSL shared libraries
ii  lsb-base                      3.1-10     Linux Standard Base 3.1 init scrip
ii  netbase                       4.25       Basic TCP/IP networking system

ntpdate recommends no packages.

-- no debconf information
-------------- next part --------------
--- ntpdate.orig	2006-09-19 22:24:23.000000000 +0900
+++ ntpdate	2006-09-19 22:26:57.000000000 +0900
@@ -1,7 +1,10 @@
 # Servers to check (Separate multiple servers with spaces.)
 # This code will take the server list from /etc/ntp.conf, from package ntp,
 # so you only have to keep it in one place.
-NTPSERVERS=$(sed -rne 's/^(server|peer) ([-_.[:alnum:]]+).*$/\2/p' /etc/ntp.conf | grep -v '^127\.127\.' 2>/dev/null)
+NTPCONF=/etc/ntp.conf
+if [ -e $NTPCONF ]; then
+	NTPSERVERS=$(sed -rne 's/^(server|peer) ([-_.[:alnum:]]+).*$/\2/p' $NTPCONF | grep -v '^127\.127\.' 2>/dev/null)
+fi
 if [ -z "$NTPSERVERS" ]; then
 	NTPSERVERS="0.debian.pool.ntp.org 1.debian.pool.ntp.org 2.debian.pool.ntp.org 3.debian.pool.ntp.org"
 fi