From 355d383fdfc192c95c4a8930c0fa44935bd6f553 Mon Sep 17 00:00:00 2001 From: Christoph Date: Mon, 7 May 2018 03:22:12 +0200 Subject: [PATCH] Fix crontab/rc.local setting if network is NONE-CKUBU or NONE-WF --- change_network_gateway.sh | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/change_network_gateway.sh b/change_network_gateway.sh index 576d318..b59d41a 100755 --- a/change_network_gateway.sh +++ b/change_network_gateway.sh @@ -828,13 +828,9 @@ fi ## - Cron (root) ## - echo -en "\tSetting up cronjobs.." -if [ "$network" = "NONE-CKUBU" -o "$network" = "NONE-WF" -o "$network" = "GA-Ersatz" ];then - cp -a ${base_dir}/crontab_root.NONE /var/spool/cron/crontabs/root > $logfile 2>&1 -else - if [ -f ${base_dir}/${network}/cron_root.${network} ];then - cp -a ${base_dir}/${network}/cron_root.${network} /var/spool/cron/crontabs/root > $logfile 2>&1 - fi -fi +if [ -f "${base_dir}/${network}/cron_root.${network}" ];then + cp -a ${base_dir}/${network}/cron_root.${network} /var/spool/cron/crontabs/root > $logfile 2>&1 +fi if [ "$?" != "0" ]; then echo_FAILED error $(cat $logfile) @@ -843,9 +839,7 @@ else fi echo -en "\tSetting up rc.local.." -if [ "$network" = "NONE-CKUBU" -o "$network" = "NONE-WF" -o "$network" = "GA-Ersatz" ];then - cp -a ${base_dir}/rc.local.NONE /etc/rc.local > $logfile 2>&1 -else +if [ -f "${base_dir}/${network}/rc.local.${network}" ];then cp -a ${base_dir}/${network}/rc.local.${network} /etc/rc.local > $logfile 2>&1 fi if [ "$?" != "0" ]; then