diff -urN ntp-4.2.4p4+dfsg.orig/debian/changelog ntp-4.2.4p4+dfsg/debian/changelog --- ntp-4.2.4p4+dfsg.orig/debian/changelog 2008-03-06 13:53:17.000000000 +0900 +++ ntp-4.2.4p4+dfsg/debian/changelog 2008-03-06 14:01:16.000000000 +0900 @@ -1,3 +1,10 @@ +ntp (1:4.2.4p4+dfsg-3ubuntu2) hardy; urgency=low + + * Stop ntp before running ntpdate when an interface + comes up, then start again afterwards (LP: #114505) + + -- Onno Benschop Thu, 6 Mar 2008 14:00:42 +0900 + ntp (1:4.2.4p4+dfsg-3ubuntu1) hardy; urgency=low * Merge from debian unstable, remaining changes: diff -urN ntp-4.2.4p4+dfsg.orig/debian/ntpdate.ifup ntp-4.2.4p4+dfsg/debian/ntpdate.ifup --- ntp-4.2.4p4+dfsg.orig/debian/ntpdate.ifup 2008-03-06 13:53:17.000000000 +0900 +++ ntp-4.2.4p4+dfsg/debian/ntpdate.ifup 2008-03-06 13:59:29.000000000 +0900 @@ -23,6 +23,9 @@ OPTS="-b" fi +invoke-rc.d --quiet ntp stop || true + /usr/sbin/ntpdate-debian -s $OPTS 2>/dev/null +invoke-rc.d --quiet ntp start || true + ) &