From bb0128730f1906ebd9483a936a1c758290d50484 Mon Sep 17 00:00:00 2001
From: Stefal <stephane.peneau@wanadoo.fr>
Date: Sat, 5 Oct 2024 21:04:48 +0200
Subject: [PATCH] Fix #436

---
 CHANGELOG.md            |  4 ++++
 settings.conf.default   |  2 +-
 tools/rtkbase_update.sh | 18 ++++++++++++++++++
 3 files changed, 23 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c22f879..2501839 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Changelog
 
+## [2.6.2] - Unreleased
+### Fixed
+ - Remove firstboot service on Raspberry Pi image >= 2.5 which was causing services to stay stopped after a reboot. #436
+ - Autorefresh timeout is now 90s. #426
 ## [2.6.1] - 2024-08-26
 ### Changed
  - More tests before installing prebuilt RTKLib cli tools.
diff --git a/settings.conf.default b/settings.conf.default
index b50e2e4..e806217 100644
--- a/settings.conf.default
+++ b/settings.conf.default
@@ -2,7 +2,7 @@
 
 [general]
 # Version
-version=2.6.1
+version=2.6.2
 # Rtkbase upgrade mandatory "checkpoint"
 checkpoint_version=2.7.0
 # User who runs str2str_file service
diff --git a/tools/rtkbase_update.sh b/tools/rtkbase_update.sh
index 4dcc46e..47c48cb 100755
--- a/tools/rtkbase_update.sh
+++ b/tools/rtkbase_update.sh
@@ -207,6 +207,24 @@ upd_2.6.0() {
    then
      "${destination_directory}"/tools/install.sh --user "${standard_user}" --rtklib
   fi
+  upd_2.6.1 "$@"
+}
+
+upd_2.6.1() {
+  #Remove firstboot service from the Raspberry 2.5 and 2.6 images
+  #This service should have been removed after the first boot, but
+  # wasn't and was stopping various RTKBase services at each boot. 
+  if [[ -f /etc/os-release ]]
+    then
+      source /etc/os-release
+  fi
+
+  if [[ $ID == debian ]] && systemctl list-units firstboot.service
+    then
+      systemctl disable --now firstboot.service
+      rm /lib/systemd/system/firstboot.service
+      systemctl daemon-reload
+  fi
 }
 
 #check if we can apply the update