Package: ntpdate
Version: 1:4.2.6.p2+dfsg-1ubuntu5
Severity: normal
Tags: patch

--- Please enter the report below this line. ---

same bug in ubuntu

https://bugs.launchpad.net/ubuntu/+source/ntp/+bug/427775

--- System information. ---
Architecture: i386
Kernel:       Linux 2.6.38-5-generic

Debian Release: squeeze/sid
  500 testing         dl.google.com 
  500 stable          dl.google.com 
  500 stable          deb.opera.com 
  500 natty-updates   ru.archive.ubuntu.com 
  500 natty-security  security.ubuntu.com 
  500 natty           ru.archive.ubuntu.com 
  500 natty           ppa.launchpad.net 
  500 natty           extras.ubuntu.com 
  500 natty           archive.canonical.com 
  500 maverick        ppa.launchpad.net 
  500 maverick        archive.canonical.com 
  500 lucid           ppa.launchpad.net 

--- Package information. ---
Depends             (Version) | Installed
=============================-+-==============
netbase                       | 4.45ubuntu1
libc6                (>= 2.4) | 2.13-0ubuntu4
libcap2             (>= 2.10) | 1:2.20-1
libssl0.9.8     (>= 0.9.8m-1) | 0.9.8o-5ubuntu1


Recommends          (Version) | Installed
=============================-+-===========
lockfile-progs                | 0.1.15


Package's Suggests field is empty.



--- ntpdate-debian.orig	2009-11-13 19:35:55.000000000 +0300
+++ ntpdate-debian	2011-03-13 00:44:54.580236100 +0300
@@ -6,6 +6,10 @@
 	. /etc/default/ntpdate
 fi
 
+if [ -r /var/lib/ntpdate/default.dhcp ]; then
+	. /var/lib/ntpdate/default.dhcp
+fi
+
 if [ "$NTPDATE_USE_NTP_CONF" = yes ]; then
 	for f in /var/lib/ntp/ntp.conf.dhcp /etc/ntp.conf /etc/openntpd/ntpd.conf; do
 		if [ -r "$f" ]; then
@@ -16,8 +20,6 @@
 	if [ -n "$file" ]; then
 		NTPSERVERS=$(sed -rne 's/^(servers?|peer) ([-_.:[:alnum:]]+).*$/\2/p' "$file" | grep -v '^127\.127\.') || [ $? -le 1 ]
 	fi
-elif [ -r /var/lib/ntpdate/default.dhcp ]; then
-	. /var/lib/ntpdate/default.dhcp
 fi
 
 exec /usr/sbin/ntpdate $NTPOPTIONS "$@" $NTPSERVERS

Attachment: signature.asc
Description: This is a digitally signed message part.

Reply via email to