From 84c5f0d66d5312005a2c7528dbf686dc1968cd10 Mon Sep 17 00:00:00 2001 From: Michael Tremer Date: Thu, 3 Dec 2015 14:57:30 +0000 Subject: [PATCH] ramdisk: Move crontab back to disk Signed-off-by: Michael Tremer --- config/rootfiles/core/96/update.sh | 8 ++++++++ src/initscripts/init.d/collectd | 14 +------------- src/initscripts/init.d/fcron | 1 - 3 files changed, 9 insertions(+), 14 deletions(-) diff --git a/config/rootfiles/core/96/update.sh b/config/rootfiles/core/96/update.sh index 7faf4b8191..764e6bf09e 100644 --- a/config/rootfiles/core/96/update.sh +++ b/config/rootfiles/core/96/update.sh @@ -32,6 +32,7 @@ do done # Stop services +/etc/init.d/fcron stop # Extract files extract_files @@ -39,7 +40,14 @@ extract_files # Update Language cache # /usr/local/bin/update-lang-cache +if [ -L "/var/spool/cron" ]; then + rm -f /var/spool/cron + mv /var/log/rrd/cron /var/spool/cron + chown cron:cron /var/spool/cron +fi + # Start services +/etc/init.d/fcron start /etc/init.d/dnsmasq restart # This update need a reboot... diff --git a/src/initscripts/init.d/collectd b/src/initscripts/init.d/collectd index a38b4f17fb..24187d2158 100644 --- a/src/initscripts/init.d/collectd +++ b/src/initscripts/init.d/collectd @@ -21,25 +21,13 @@ case "$1" in fi mount_ramdisk "$RRDLOG" evaluate_retval - #cleanup cron - if [ -e $RRDLOG.bak/cron/new.root ]; then - if [ -e $RRDLOG.bak/cron/root ]; then - rm -f $RRDLOG.bak/cron/new.root - fi - fi + #restore old values to ramdisk if exist restore_ramdisk "$RRDLOG" fi else restore_ramdisk "$RRDLOG" fi - # - # Move /var/spool/cron to ramdisk and make a symlink - # - if [ ! -L /var/spool/cron ]; then - mv /var/spool/cron /var/log/rrd/cron - ln -s /var/log/rrd/cron /var/spool/cron - fi # If run from init and collectd alrady started then exit silent if [ "$(basename $0)" != "collectd" ]; then diff --git a/src/initscripts/init.d/fcron b/src/initscripts/init.d/fcron index 0260d4ad62..00a70bd4a3 100644 --- a/src/initscripts/init.d/fcron +++ b/src/initscripts/init.d/fcron @@ -13,7 +13,6 @@ case "$1" in start) boot_mesg "Starting fcron..." - chown cron:cron /var/spool/cron loadproc /usr/sbin/fcron -y # remove -y to reenable fcron logging ;; -- 2.39.5