Hello community, here is the log from the commit of package ntp checked in at Mon Oct 6 17:28:57 CEST 2008. -------- --- ntp/ntp.changes 2008-09-29 16:55:34.000000000 +0200 +++ /mounts/work_src_done/STABLE/ntp/ntp.changes 2008-10-02 11:31:21.000000000 +0200 @@ -1,0 +2,5 @@ +Thu Oct 2 11:15:27 CEST 2008 - varkoly@suse.de + +- (bnc#431175) - ntpd hangs during init + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ntp.spec ++++++ --- /var/tmp/diff_new_pack.v17827/_old 2008-10-06 17:26:55.000000000 +0200 +++ /var/tmp/diff_new_pack.v17827/_new 2008-10-06 17:26:55.000000000 +0200 @@ -27,7 +27,7 @@ License: BSD 3-Clause Group: Productivity/Networking/Other Version: 4.2.4p5 -Release: 4 +Release: 5 Summary: Network Time Protocol daemon (version 4) # main source Source0: ntp-%{version}.tar.bz @@ -395,6 +395,8 @@ %doc html/* %changelog +* Thu Oct 02 2008 varkoly@suse.de +- (bnc#431175) - ntpd hangs during init * Fri Sep 26 2008 varkoly@suse.de - (bnc#387236) - VUL-0: ntp complains about format/parity error for MD5 key 1, not used ++++++ conf.ntp.init ++++++ --- ntp/conf.ntp.init 2008-09-26 17:04:51.000000000 +0200 +++ /mounts/work_src_done/STABLE/ntp/conf.ntp.init 2008-10-02 11:53:28.562946000 +0200 @@ -14,8 +14,8 @@ # Provides: ntp ntpd xntpd # Required-Start: $remote_fs $syslog $named # Required-Stop: $remote_fs $syslog -# Default-Start: 2 3 5 -# Default-Stop: 0 1 6 +# Default-Start: 3 5 +# Default-Stop: 0 1 2 6 # Short-Description: Network time protocol daemon (ntpd) # Description: Start network time protocol daemon (NTPD). ### END INIT INFO @@ -167,9 +167,9 @@ stop) echo -n "Shutting down network time protocol daemon (NTPD)" killproc -p ${NTPD_PID} -TERM $NTPD_BIN - umount ${CHROOT_PREFIX}/proc 2>/dev/null rc_status -v - rm -f ${NTPD_PID} + umount ${CHROOT_PREFIX}/proc 2>/dev/null + rm -f ${NTPD_PID} 2>/dev/null ;; try-restart) $0 status @@ -223,11 +223,22 @@ ;; ntptimeset) if grep -v 127.127.1.0 $NTP_CONF | grep ^server >/dev/null; then - # Do not execute by booting when not allowed! - if [ "$PREVLEVEL" != "N" -o "$NTPD_BOOT_SYNC" = "yes" ] + startproc $NTPD_BIN $NTPD_OPTIONS -c $NTP_CONF -q + notreached=1 + for i in 1 2 3 4 5 6 7 8 9 10; do + sleep 1; + NTPDPID=`ps ax | awk '$5 ~ /\/usr\/sbin\/ntpd/ {print $1}'` + if [ -z "$NTPDPID" ] then - $NTPD_BIN $NTPD_OPTIONS -c $NTP_CONF -q + notreached=0 + break fi + echo -n " ." + done + if [ $notreached -eq 1 ]; then + kill -9 $NTPDPID + echo -n " ${warn}no server reached${norm}"; + fi else echo "no server configured" fi ++++++ conf.sysconfig.ntp ++++++ --- ntp/conf.sysconfig.ntp 2008-09-26 17:04:51.000000000 +0200 +++ /mounts/work_src_done/STABLE/ntp/conf.sysconfig.ntp 2008-10-02 11:31:47.000000000 +0200 @@ -62,12 +62,3 @@ # /usr/share/doc/packages/xntp-doc/drivers/driver8.html # NTP_PARSE_DEVICE="" - -## Type: yesno -## Default: yes -## ServiceRestart: ntp -# -# Shall the time server ntpd syncronize the time by booting the system? -# -NTPD_BOOT_SYNC="yes" - ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org