The following changes were made:
* Moved crontab from usher into CONFIG * Modified init script to use status_of_proc from init-functions * Modified usher to use init script status to check if daemon running
This commit is contained in:
5
Makefile
5
Makefile
@@ -15,7 +15,7 @@ URL = http://ftp.isc.org/isc/cron/
|
|||||||
REPO = main
|
REPO = main
|
||||||
BRIEF = daemon to execute scheduled commands
|
BRIEF = daemon to execute scheduled commands
|
||||||
DESC = An implimentation of cron based on the SysV cron (aka Vixie cron)
|
DESC = An implimentation of cron based on the SysV cron (aka Vixie cron)
|
||||||
SNAPVER = 1
|
SNAPVER = 2
|
||||||
|
|
||||||
ARCHIVE := $(PWD)/$(shell ls SRC/*.shar|tail -1)
|
ARCHIVE := $(PWD)/$(shell ls SRC/*.shar|tail -1)
|
||||||
SRCDIR := cron-$(shell echo $(ARCHIVE)|egrep -o '[0-9]\.[0-9]')
|
SRCDIR := cron-$(shell echo $(ARCHIVE)|egrep -o '[0-9]\.[0-9]')
|
||||||
@@ -64,8 +64,6 @@ $(ROOT): $(SRCDIR)/cron
|
|||||||
install -v -m 644 crontab.5 $(ROOT)/usr/share/man/man5/crontab.5 && \
|
install -v -m 644 crontab.5 $(ROOT)/usr/share/man/man5/crontab.5 && \
|
||||||
install -v -m 644 cron.8 $(ROOT)/usr/share/man/man8/cron.8 && \
|
install -v -m 644 cron.8 $(ROOT)/usr/share/man/man8/cron.8 && \
|
||||||
install -v -m 755 $(SNAPDIR)/cron.init $(ROOT)/etc/init.d/cron && \
|
install -v -m 755 $(SNAPDIR)/cron.init $(ROOT)/etc/init.d/cron && \
|
||||||
install -v -m 600 $(SNAPDIR)/crontab \
|
|
||||||
$(ROOT)/usr/share/cron/crontab && \
|
|
||||||
install -v -m 755 $(SNAPDIR)/runall $(ROOT)/bin
|
install -v -m 755 $(SNAPDIR)/runall $(ROOT)/bin
|
||||||
|
|
||||||
test: $(ROOT)
|
test: $(ROOT)
|
||||||
@@ -77,5 +75,6 @@ clean:
|
|||||||
$(SNAPINFO) \
|
$(SNAPINFO) \
|
||||||
$(MANIFEST) \
|
$(MANIFEST) \
|
||||||
$(FILES) \
|
$(FILES) \
|
||||||
|
$(CONFIG) \
|
||||||
$(SRCDIR)
|
$(SRCDIR)
|
||||||
|
|
||||||
|
|||||||
@@ -36,13 +36,7 @@ case "$1" in
|
|||||||
$0 start
|
$0 start
|
||||||
;;
|
;;
|
||||||
status)
|
status)
|
||||||
pid=$(pidofproc -p "$PIDFILE" "$DAEMON")
|
status_of_proc -p "$PIDFILE" "$DAEMON" || exit 1
|
||||||
|
|
||||||
if [ "$?" -ne 0 ]; then
|
|
||||||
echo "cron not running"
|
|
||||||
else
|
|
||||||
echo "cron running with PID: $pid"
|
|
||||||
fi
|
|
||||||
;;
|
;;
|
||||||
*)
|
*)
|
||||||
echo "Usage: $0 [start|stop|restart|status]"
|
echo "Usage: $0 [start|stop|restart|status]"
|
||||||
|
|||||||
@@ -7,12 +7,11 @@ case $1 in
|
|||||||
exit 0
|
exit 0
|
||||||
;;
|
;;
|
||||||
postinst)
|
postinst)
|
||||||
[ -f "/run/cron.pid" ] && /etc/init.d/cron restart
|
/etc/init.d/cron status 2>&1 > /dev/null && /etc/init.d/cron restart
|
||||||
[ -f "/etc/crontab" ] || cp /usr/share/cron/crontab /etc/crontab
|
|
||||||
exit 0
|
exit 0
|
||||||
;;
|
;;
|
||||||
prerm)
|
prerm)
|
||||||
[ -f "/run/cron.pid" ] && /etc/init.d/cron stop
|
/etc/init.d/cron status 2>&1 > /dev/null && /etc/init.d/cron stop
|
||||||
exit 0
|
exit 0
|
||||||
;;
|
;;
|
||||||
postrm)
|
postrm)
|
||||||
|
|||||||
Reference in New Issue
Block a user