diff --git a/package/busybox/S50crond b/package/busybox/S50crond new file mode 100644 index 0000000000..74a0c0849b --- /dev/null +++ b/package/busybox/S50crond @@ -0,0 +1,60 @@ +#!/bin/sh + +DAEMON="crond" +PIDFILE="/var/run/$DAEMON.pid" + +CROND_ARGS="" + +# shellcheck source=/dev/null +[ -r "/etc/default/$DAEMON" ] && . "/etc/default/$DAEMON" + +# BusyBox' crond does not create a pidfile, so pass "-f" on the crond +# command line and use "--make-pidfile" to instruct start-stop-daemon +# to create one. +start() { + printf 'Starting %s: ' "$DAEMON" + # shellcheck disable=SC2086 # we need the word splitting + start-stop-daemon --start --background --make-pidfile \ + --pidfile "$PIDFILE" --exec "/usr/sbin/$DAEMON" \ + -- -f $CROND_ARGS + status=$? + if [ "$status" -eq 0 ]; then + echo "OK" + else + echo "FAIL" + fi + return "$status" +} + +stop() { + printf 'Stopping %s: ' "$DAEMON" + start-stop-daemon --stop --pidfile "$PIDFILE" --exec "/usr/sbin/$DAEMON" + status=$? + if [ "$status" -eq 0 ]; then + echo "OK" + else + echo "FAIL" + fi + while start-stop-daemon --stop --test --quiet --pidfile "$PIDFILE" \ + --exec "/sbin/$DAEMON"; do + sleep 0.1 + done + rm -f "$PIDFILE" + return "$status" +} + +restart() { + stop + start +} + +case "$1" in + start|stop|restart) + "$1";; + reload) + # Restart, since there is no true "reload" feature. + restart;; + *) + echo "Usage: $0 {start|stop|restart|reload}" + exit 1 +esac diff --git a/package/busybox/busybox.config b/package/busybox/busybox.config index 35c01181bd..69d896bebd 100644 --- a/package/busybox/busybox.config +++ b/package/busybox/busybox.config @@ -782,7 +782,7 @@ CONFIG_CROND=y # CONFIG_FEATURE_CROND_D is not set # CONFIG_FEATURE_CROND_CALL_SENDMAIL is not set CONFIG_FEATURE_CROND_SPECIAL_TIMES=y -CONFIG_FEATURE_CROND_DIR="/var/spool/cron" +CONFIG_FEATURE_CROND_DIR="/etc/cron" CONFIG_CRONTAB=y # CONFIG_DEVFSD is not set # CONFIG_DEVFSD_MODLOAD is not set diff --git a/package/busybox/busybox.mk b/package/busybox/busybox.mk index eb5e7ad922..f1e0a7e6da 100644 --- a/package/busybox/busybox.mk +++ b/package/busybox/busybox.mk @@ -312,6 +312,18 @@ define BUSYBOX_INSTALL_SYSCTL_SCRIPT endef endif +# Only install our crond script if no other package does it. +ifeq ($(BR2_PACKAGE_DCRON),) +define BUSYBOX_INSTALL_CROND_SCRIPT + if grep -q CONFIG_CROND=y $(@D)/.config; \ + then \ + mkdir -p $(TARGET_DIR)/etc/cron/crontabs ; \ + $(INSTALL) -m 0755 -D package/busybox/S50crond \ + $(TARGET_DIR)/etc/init.d/S50crond; \ + fi; +endef +endif + ifeq ($(BR2_INIT_BUSYBOX),y) define BUSYBOX_INSTALL_INITTAB if test ! -e $(TARGET_DIR)/etc/inittab; then \ @@ -407,6 +419,7 @@ define BUSYBOX_INSTALL_INIT_OPENRC $(BUSYBOX_INSTALL_MDEV_SCRIPT) $(BUSYBOX_INSTALL_LOGGING_SCRIPT) $(BUSYBOX_INSTALL_WATCHDOG_SCRIPT) + $(BUSYBOX_INSTALL_CROND_SCRIPT) $(BUSYBOX_INSTALL_TELNET_SCRIPT) endef @@ -419,6 +432,7 @@ define BUSYBOX_INSTALL_INIT_SYSV $(BUSYBOX_INSTALL_LOGGING_SCRIPT) $(BUSYBOX_INSTALL_WATCHDOG_SCRIPT) $(BUSYBOX_INSTALL_SYSCTL_SCRIPT) + $(BUSYBOX_INSTALL_CROND_SCRIPT) $(BUSYBOX_INSTALL_TELNET_SCRIPT) endef