cleanup run-command script

ntp/ntp.spec

@@ -33,7 +33,7 @@ Distribution: OpenPKG [CORE]
 Group:        Network
 License:      BSD-style
 Version:      4.1.1c
-Release:      20030708
+Release:      20030709
 
 #   package options
 %option       with_fsl  yes

ntp/rc.ntp

@@ -21,69 +21,76 @@
 
 %start -p 200 -u @l_susr@
     opServiceEnabled ntp || exit 0
+
     #   synchronize local machine once at startup
     #   because ntpd does not skip large time offsets
     @l_prefix@/bin/ntpdate \
         `grep "^server" @l_prefix@/etc/ntp/ntp.conf |\
          awk '{ printf(" %s", $2); }'`
-    opVarIsYes ntp_daemon || exit 0
+
     #   run the NTP daemon for continued synchronization
-    @l_prefix@/bin/ntpd \
-        -p @l_prefix@/var/ntp/ntpd.pid \
-        -f @l_prefix@/var/ntp/ntpd.drift \
-        -s @l_prefix@/var/ntp/ntpd.stat/
+    if opVarIsYes ntp_daemon; then
+        @l_prefix@/bin/ntpd \
+            -p @l_prefix@/var/ntp/ntpd.pid \
+            -f @l_prefix@/var/ntp/ntpd.drift \
+            -s @l_prefix@/var/ntp/ntpd.stat/
+    fi
 
 %stop -p 200 -u @l_susr@
-    opServiceEnabled ntp && opVarIsYes ntp_daemon || exit 0
-    ntp_signal TERM
+    opServiceEnabled ntp || exit 0
+    if opVarIsYes ntp_daemon; then
+        ntp_signal TERM
+    fi
 
 %restart -u @l_susr@
-    opServiceEnabled ntp && opVarIsYes ntp_daemon || exit 0
-    ntp_signal TERM
-    sleep 2
-    #   restart the NTP daemon for continued synchronization
-    @l_prefix@/bin/ntpd \
-        -p @l_prefix@/var/ntp/ntpd.pid \
-        -f @l_prefix@/var/ntp/ntpd.drift \
-        -s @l_prefix@/var/ntp/ntpd.stat/
-
-%hourly -u @l_susr@
     opServiceEnabled ntp || exit 0
-    opVarIsYes ntp_daemon && exit 0
-    (
-        sleep 30
-        @l_prefix@/bin/ntpdate \
-            `grep "^server" @l_prefix@/etc/ntp/ntp.conf |\
-             awk '{ printf(" %s", $2); }'`
-    ) >/dev/null &
-
-%daily -u @l_susr@
-    opServiceEnabled ntp && opVarIsYes ntp_daemon || exit 0
-    opTmpDirGen ntp
-    opTmpDirFile ntp hint hintfile
-    prolog="true"
-    if [ ".$ntp_log_prolog" != . ]; then
-        prolog="$prolog; $ntp_log_prolog"
-    fi
-    epilog="echo 'epilog' >$hintfile"
-    if [ ".$ntp_log_epilog" != . ]; then
-        epilog="$epilog; $ntp_log_epilog"
-    fi
-    shtool rotate -f \
-        -n${ntp_log_numfiles} -s${ntp_log_minsize} \
-        -d -z${ntp_log_complevel} \
-        -o@l_musr@ -g@l_mgrp@ -m644 \
-        -P "$prolog" \
-        -E "$epilog" \
-        @l_prefix@/var/ntp/ntp.log
-    if [ ".`cat $hintfile`" = ".epilog" ]; then
+    if opVarIsYes ntp_daemon; then
         ntp_signal TERM
         sleep 2
-        #   restart the NTP daemon
         @l_prefix@/bin/ntpd \
             -p @l_prefix@/var/ntp/ntpd.pid \
             -f @l_prefix@/var/ntp/ntpd.drift \
             -s @l_prefix@/var/ntp/ntpd.stat/
     fi
-    opTmpDirDel ntp
+
+%hourly -u @l_susr@
+    opServiceEnabled ntp || exit 0
+    if ! opVarIsYes ntp_daemon; then
+        ( sleep 30
+          @l_prefix@/bin/ntpdate \
+              `grep "^server" @l_prefix@/etc/ntp/ntp.conf |\
+               awk '{ printf(" %s", $2); }'`
+        ) >/dev/null &
+    fi
+
+%daily -u @l_susr@
+    opServiceEnabled ntp || exit 0
+    if opVarIsYes ntp_daemon; then
+        opTmpDirGen ntp
+        opTmpDirFile ntp hint hintfile
+        prolog="true"
+        if [ ".$ntp_log_prolog" != . ]; then
+            prolog="$prolog; $ntp_log_prolog"
+        fi
+        epilog="echo 'epilog' >$hintfile"
+        if [ ".$ntp_log_epilog" != . ]; then
+            epilog="$epilog; $ntp_log_epilog"
+        fi
+        shtool rotate -f \
+            -n${ntp_log_numfiles} -s${ntp_log_minsize} \
+            -d -z${ntp_log_complevel} \
+            -o@l_musr@ -g@l_mgrp@ -m644 \
+            -P "$prolog" \
+            -E "$epilog" \
+            @l_prefix@/var/ntp/ntp.log
+        if [ ".`cat $hintfile`" = ".epilog" ]; then
+            ntp_signal TERM
+            sleep 2
+            @l_prefix@/bin/ntpd \
+                -p @l_prefix@/var/ntp/ntpd.pid \
+                -f @l_prefix@/var/ntp/ntpd.drift \
+                -s @l_prefix@/var/ntp/ntpd.stat/
+        fi
+        opTmpDirDel ntp
+    fi