Hello community, here is the log from the commit of package ntp for openSUSE:Factory checked in at Fri Apr 16 01:09:50 CEST 2010. -------- --- ntp/ntp.changes 2010-03-18 17:59:05.000000000 +0100 +++ /mounts/work_src_done/STABLE/ntp/ntp.changes 2010-04-09 17:31:56.000000000 +0200 @@ -1,0 +2,10 @@ +Fri Apr 9 15:30:57 UTC 2010 - varkoly@novell.com + +- rcntp timeset now gets the time via sntp inmediately + +------------------------------------------------------------------- +Sun Mar 21 20:10:55 UTC 2010 - novellbmw@lsmod.de + +- fix read-only mount of proc in chroot + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ntp.spec ++++++ --- /var/tmp/diff_new_pack.vxVoO0/_old 2010-04-16 01:06:54.000000000 +0200 +++ /var/tmp/diff_new_pack.vxVoO0/_new 2010-04-16 01:06:54.000000000 +0200 @@ -27,7 +27,7 @@ License: BSD3c(or similar) Group: Productivity/Networking/Other Version: 4.2.4p8 -Release: 3 +Release: 4 Summary: Network Time Protocol daemon (version 4) # main source Source0: ntp-%{version}.tar.bz ++++++ conf.ntp.init ++++++ --- /var/tmp/diff_new_pack.vxVoO0/_old 2010-04-16 01:06:54.000000000 +0200 +++ /var/tmp/diff_new_pack.vxVoO0/_new 2010-04-16 01:06:54.000000000 +0200 @@ -111,7 +111,8 @@ mkdir -p ${CHROOT_PREFIX}/proc # prepare_chroot is called on every "start", but we need to mount only once if ! grep -q " ${CHROOT_PREFIX}/proc proc " /proc/mounts; then - mount -o bind,ro /proc ${CHROOT_PREFIX}/proc 2>/dev/null + mount -o bind /proc ${CHROOT_PREFIX}/proc 2>/dev/null + mount -o remount,ro,nosuid,nodev ${CHROOT_PREFIX}/proc 2>/dev/null fi NTPD_OPTIONS="${NTPD_OPTIONS} -i ${CHROOT_PREFIX}" } @@ -218,25 +219,15 @@ rc_status ;; ntptimeset) - if grep -v 127.127.1.0 $NTP_CONF | grep ^server >/dev/null; then - 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 - notreached=0 - break - fi - echo -n " ." - done - if [ $notreached -eq 1 ]; then - kill -9 $NTPDPID - echo " ${warn}no server reached${norm}"; - fi + for i in $(gawk '/^server/ { if( $2 != "127.127.1.0" ) print $2 }' $NTP_CONF) + do + sntp -P no -r $i 2> /dev/null && { SYNCHRONISED=$i; break; }; + done + if [ "$SYNCHRONISED" ] + then + echo "Time sinchronized with $SYNCHRONISED" else - echo "no server configured" + echo "Time could not be synchronized" fi ;; reload) ++++++ conf.sysconfig.ntp ++++++ --- /var/tmp/diff_new_pack.vxVoO0/_old 2010-04-16 01:06:54.000000000 +0200 +++ /var/tmp/diff_new_pack.vxVoO0/_new 2010-04-16 01:06:54.000000000 +0200 @@ -41,7 +41,7 @@ # NTP_PARSE_LINK="" -## Type: string +## Type: boolean ## Default: "" ## ServiceRestart: ntp # ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org