fix: 25-add-cron-jobs.sh - fixes #692

Author: bslatyer

on-boot-script-2.x/examples/udm-files/on_boot.d/25-add-cron-jobs.sh

@@ -1,5 +1,5 @@
 #!/bin/bash
-# Get DataDir location
+# Get ${DATA_DIR} location
 DATA_DIR="/data"
 case "$(ubnt-device-info firmware || true)" in
 1*)
@@ -13,10 +13,18 @@ case "$(ubnt-device-info firmware || true)" in
     exit 1
     ;;
 esac
+
 ## Store crontab files in ${DATA_DIR}/cronjobs/ (you will need to create this folder).
 ## This script will re-add them on startup.
 
 cp ${DATA_DIR}/cronjobs/* /etc/cron.d/
-/etc/init.d/crond restart
+# Older UDM's had crond, so lets check if its here if so use that one, otherwise use cron
+if [ -x /etc/init.d/crond ]; then
+    /etc/init.d/crond restart
+elif [ -x /etc/init.d/cron ]; then
+    /etc/init.d/cron restart
+else
+    echo "Neither crond nor cron found."
+fi
 
 exit 0

on-boot-script/examples/udm-files/on_boot.d/25-add-cron-jobs.sh

@@ -1,35 +1,30 @@
 #!/bin/bash
-# Get DataDir location
+# Get ${DATA_DIR} location
 DATA_DIR="/data"
 case "$(ubnt-device-info firmware || true)" in
 1*)
     DATA_DIR="/mnt/data"
     ;;
-2*)
+2* | 3* | 4* | 5*)
     DATA_DIR="/data"
     ;;
-3*)
-    DATA_DIR="/data"
-    ;;
-4*)
-  DATA_DIR="/data"
-  ;;
 *)
     echo "ERROR: No persistent storage found." 1>&2
     exit 1
     ;;
 esac
+
 ## Store crontab files in ${DATA_DIR}/cronjobs/ (you will need to create this folder).
 ## This script will re-add them on startup.
 
 cp ${DATA_DIR}/cronjobs/* /etc/cron.d/
 # Older UDM's had crond, so lets check if its here if so use that one, otherwise use cron
 if [ -x /etc/init.d/crond ]; then
-  /etc/init.d/crond restart
+    /etc/init.d/crond restart
 elif [ -x /etc/init.d/cron ]; then
-  /etc/init.d/cron restart
+    /etc/init.d/cron restart
 else
-  echo "Neither crond nor cron found."
+    echo "Neither crond nor cron found."
 fi
 
 exit 0