From c711ad3d7ce3c741eba945b21af0d384d3308a2d Mon Sep 17 00:00:00 2001 From: Greg Bowler Date: Tue, 6 Aug 2019 21:40:17 +0100 Subject: [PATCH 1/3] Add Masson config --- cron-boot | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/cron-boot b/cron-boot index b62a0ae..c0efa93 100644 --- a/cron-boot +++ b/cron-boot @@ -37,6 +37,20 @@ then sudo reboot fi +# Individual logbox settings: +if [ "$mac" == "7fba59" ] # 1908 test +then + if [ ! -f /home/logbox/masson-fix-1 ] + then + cd /home/logbox/hat + git fetch && git checkout 1908-masson + cd /home/logbox/os + git fetch && git checkout 1908-masson + touch /home/logbox/masson-fix-1 + sudo reboot + fi +fi + # Update all components: rebootNeeded=false declare -a component_list=("avr" "hat" "hat-update" "os") @@ -65,5 +79,14 @@ sudo touch /var/www/logbox/cfg.dat sudo chown logbox:logbox /var/www/logbox/cfg.dat sudo chmod a+w /var/www/logbox/cfg.dat +if [ "$mac" == "7fba59" ] # 1908 test +then + if [ ! -f /home/logbox/masson-fix-2 ] + then + touch /home/logbox/masson-fix-2 + sudo reboot + fi +fi + python os/data-log.py & echo $! > /home/logbox/data-log.pid From f8ec0db768e7de086225e2f994aa90c924d38802 Mon Sep 17 00:00:00 2001 From: Greg Bowler Date: Tue, 6 Aug 2019 22:01:34 +0100 Subject: [PATCH 2/3] Update hat as root --- cron-boot | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cron-boot b/cron-boot index c0efa93..e1b6a21 100644 --- a/cron-boot +++ b/cron-boot @@ -71,7 +71,7 @@ then sudo reboot fi -/usr/bin/logbox-hat-update +sudo /usr/bin/logbox-hat-update sudo crontab -u logbox "$logbox_home/os/cron.conf" From 1be08d25ddc14f50effcf30c006c3a8e4ca18fe0 Mon Sep 17 00:00:00 2001 From: Greg Bowler Date: Tue, 6 Aug 2019 22:04:07 +0100 Subject: [PATCH 3/3] Switch to Masson MAC --- cron-boot | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cron-boot b/cron-boot index e1b6a21..6e41614 100644 --- a/cron-boot +++ b/cron-boot @@ -38,7 +38,7 @@ then fi # Individual logbox settings: -if [ "$mac" == "7fba59" ] # 1908 test +if [ "$mac" == "9cb911" ] # 1908 test then if [ ! -f /home/logbox/masson-fix-1 ] then @@ -79,7 +79,7 @@ sudo touch /var/www/logbox/cfg.dat sudo chown logbox:logbox /var/www/logbox/cfg.dat sudo chmod a+w /var/www/logbox/cfg.dat -if [ "$mac" == "7fba59" ] # 1908 test +if [ "$mac" == "9cb911" ] # 1908 test then if [ ! -f /home/logbox/masson-fix-2 ] then