From d0352edeea629349a0ce497e53cb6ce34feacac0 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Fri, 4 Feb 2011 20:00:35 +0100 Subject: ntp: only install init script if ntpd is enabled Further more: - Rename to S49ntp to match other packages - Fix start target to run ntpd, and only try ntpdate if available Signed-off-by: Peter Korsgaard --- package/ntp/S49ntp | 51 +++++++++++++++++++++++++++++++++++++++++++++++ package/ntp/ntp.mk | 2 +- package/ntp/ntp.sysvinit | 52 ------------------------------------------------ 3 files changed, 52 insertions(+), 53 deletions(-) create mode 100755 package/ntp/S49ntp delete mode 100755 package/ntp/ntp.sysvinit diff --git a/package/ntp/S49ntp b/package/ntp/S49ntp new file mode 100755 index 000000000..7b929e949 --- /dev/null +++ b/package/ntp/S49ntp @@ -0,0 +1,51 @@ +#! /bin/sh +# +# System-V init script for the openntp daemon +# + +PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin +DESC="network time protocol daemon" +NAME=ntpd +DAEMON=/usr/sbin/$NAME +NTPDATE_BIN=/usr/bin/ntpdate + +# Gracefully exit if the package has been removed. +test -x $DAEMON || exit 0 + +# Read config file if it is present. +if [ -r /etc/default/$NAME ] +then + . /etc/default/$NAME +fi + +case "$1" in + start) + if [ -x $NTPDATE_BIN ] ; then + echo -n "Getting initial time via ntp" + $NTPDATE_BIN $NTPDATE_OPTS $NTPSERVERS > /dev/null 2>&1 + echo "." + fi + + echo -n "Starting $DESC: $NAME" + start-stop-daemon -S -q -x $DAEMON + echo "." + ;; + stop) echo -n "Stopping $DESC: $NAME" + start-stop-daemon -K -q -n $NAME + echo "." + ;; + reload|force-reload) echo -n "Reloading $DESC configuration..." + start-stop-daemon -K -q -n $NAME -s 1 + echo "done." + ;; + restart) echo "Restarting $DESC: $NAME" + $0 stop + sleep 1 + $0 start + ;; + *) echo "Usage: $SCRIPTNAME {start|stop|restart|reload|force-reload}" >&2 + exit 1 + ;; +esac + +exit 0 diff --git a/package/ntp/ntp.mk b/package/ntp/ntp.mk index bca5d6e57..72e462efb 100644 --- a/package/ntp/ntp.mk +++ b/package/ntp/ntp.mk @@ -42,7 +42,7 @@ NTP_INSTALL_FILES_$(BR2_PACKAGE_NTP_TICKADJ) += util/tickadj define NTP_INSTALL_TARGET_CMDS $(if $(BR2_PACKAGE_NTP_NTPD), install -m 755 $(@D)/ntpd/ntpd $(TARGET_DIR)/usr/sbin/ntpd) test -z "$(NTP_INSTALL_FILES_y)" || install -m 755 $(addprefix $(@D)/,$(NTP_INSTALL_FILES_y)) $(TARGET_DIR)/usr/bin/ - install -m 755 package/ntp/ntp.sysvinit $(TARGET_DIR)/etc/init.d/S49ntp + $(if $(BR2_PACKAGE_NTP_NTPD), install -m 755 package/ntp/S49ntp $(TARGET_DIR)/etc/init.d/S49ntp) @if [ ! -f $(TARGET_DIR)/etc/default/ntpd ]; then \ install -m 755 -d $(TARGET_DIR)/etc/default ; \ install -m 644 package/ntp/ntpd.etc.default $(TARGET_DIR)/etc/default/ntpd ; \ diff --git a/package/ntp/ntp.sysvinit b/package/ntp/ntp.sysvinit deleted file mode 100755 index 38e60b032..000000000 --- a/package/ntp/ntp.sysvinit +++ /dev/null @@ -1,52 +0,0 @@ -#! /bin/sh -# -# System-V init script for the openntp daemon -# - -PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin -DESC="network time protocol daemon" -NAME=ntpd -DAEMON=/usr/sbin/$NAME -NTPDATE_BIN=/usr/bin/ntpdate - -# Gracefully exit if the package has been removed. -test -x $DAEMON || exit 0 - -# Read config file if it is present. -if [ -r /etc/default/$NAME ] -then - . /etc/default/$NAME -fi - -case "$1" in - start) - if test x$NTPDATE = xyes ; then - echo -n "Getting initial time via ntp" - $NTPDATE_BIN $NTPDATE_OPTS $NTPSERVERS > /dev/null 2>&1 - echo "." - fi - if test x$NTPD = xyes ; then - echo -n "Starting $DESC: $NAME" - start-stop-daemon -S -q -x $DAEMON - echo "." - fi - ;; - stop) echo -n "Stopping $DESC: $NAME" - start-stop-daemon -K -q -n $NAME - echo "." - ;; - reload|force-reload) echo -n "Reloading $DESC configuration..." - start-stop-daemon -K -q -n $NAME -s 1 - echo "done." - ;; - restart) echo "Restarting $DESC: $NAME" - $0 stop - sleep 1 - $0 start - ;; - *) echo "Usage: $SCRIPTNAME {start|stop|restart|reload|force-reload}" >&2 - exit 1 - ;; -esac - -exit 0 -- cgit v1.2.3