Hello community, here is the log from the commit of package ntp checked in at Tue Oct 7 16:09:05 CEST 2008. -------- --- ntp/ntp.changes 2008-10-02 11:31:21.000000000 +0200 +++ /mounts/work_src_done/STABLE/ntp/ntp.changes 2008-10-07 14:53:12.000000000 +0200 @@ -1,0 +2,6 @@ +Tue Oct 7 13:54:24 CEST 2008 - schwab@suse.de + +- Don't try to umount /proc. +- Fix error handling. + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ntp.spec ++++++ --- /var/tmp/diff_new_pack.fu1941/_old 2008-10-07 16:04:31.000000000 +0200 +++ /var/tmp/diff_new_pack.fu1941/_new 2008-10-07 16:04:31.000000000 +0200 @@ -27,7 +27,7 @@ License: BSD 3-Clause Group: Productivity/Networking/Other Version: 4.2.4p5 -Release: 5 +Release: 6 Summary: Network Time Protocol daemon (version 4) # main source Source0: ntp-%{version}.tar.bz @@ -395,6 +395,9 @@ %doc html/* %changelog +* Tue Oct 07 2008 schwab@suse.de +- Don't try to umount /proc. +- Fix error handling. * Thu Oct 02 2008 varkoly@suse.de - (bnc#431175) - ntpd hangs during init * Fri Sep 26 2008 varkoly@suse.de ++++++ conf.ntp.init ++++++ --- ntp/conf.ntp.init 2008-10-02 11:53:28.000000000 +0200 +++ /mounts/work_src_done/STABLE/ntp/conf.ntp.init 2008-10-07 14:55:29.000000000 +0200 @@ -98,10 +98,10 @@ function prepare_chroot() { for configfile in /etc/{localtime,ntp.keys} $NTP_CONF $NTPD_CHROOT_FILES; do - test -d ${CHROOT_PREFIX}/${configfile%/*} || mkdir -p ${CHROOT_PREFIX}/${configfile%/*} + test -d ${CHROOT_PREFIX}${configfile%/*} || mkdir -p ${CHROOT_PREFIX}${configfile%/*} if [ -r ${configfile} ] then - cp -auL ${configfile} ${CHROOT_PREFIX}/${configfile%/*} + cp -auL ${configfile} ${CHROOT_PREFIX}${configfile%/*} else echo echo "Warning: ${configfile} not found or not readable" @@ -168,7 +168,7 @@ echo -n "Shutting down network time protocol daemon (NTPD)" killproc -p ${NTPD_PID} -TERM $NTPD_BIN rc_status -v - umount ${CHROOT_PREFIX}/proc 2>/dev/null + test -n "${CHROOT_PREFIX}" && umount ${CHROOT_PREFIX}/proc 2>/dev/null rm -f ${NTPD_PID} 2>/dev/null ;; try-restart) @@ -190,35 +190,34 @@ $0 status if test $? = 0; then $0 stop - $0 start iburst - else - rc_reset # Not running is not a failure. - fi - # Remember status and be quiet - rc_status + $0 start iburst + else + rc_reset # Not running is not a failure. + fi + # Remember status and be quiet + rc_status ;; addserver) if [ -z "${NTP_KEYS}" ]; then - echo -n "Runtime configuration disabled, no key file specified." - rc_failed 3 + echo "Runtime configuration disabled, no key file specified." exit 1 fi - if test "${#@}" -lt "2"; then - echo -n "No servers to add specified" - rc_failed 3 + if test $# -lt 2; then + echo "No servers to add specified" + exit 1 fi shift $0 status 2>&1 >/dev/null if test $? = 0; then - add_runtime_server $@ + add_runtime_server "$@" fi ;; force-reload) # Does not support signalling to reload - $0 try-restart + $0 try-restart rc_status ;; ntptimeset) @@ -237,7 +236,7 @@ done if [ $notreached -eq 1 ]; then kill -9 $NTPDPID - echo -n " ${warn}no server reached${norm}"; + echo " ${warn}no server reached${norm}"; fi else echo "no server configured" ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org