fixup! feat: Boot count with fallback to old system [WIP]

Author: zehnm

buildroot-external/board/raspberrypi/rootfs-overlay/etc/swupdate/reset-bootcount.sh

@@ -1,15 +1,30 @@
 #!/bin/sh
 
+systemctl is-active --quiet app || {
+  echo "Remote app not running!"
+  exit 1
+}
+
 ISUPGRADING=$(fw_printenv upgrade_available | awk -F'=' '{print $2}')
 echo "upgrade_available=$ISUPGRADING"
 if [ -z "$ISUPGRADING" ]
 then
-    echo "No RootFs update pending"
+    echo "No system update pending"
 else
-    echo "RootFs update pending, verifying system"
+    echo "System update pending, verifying system..."
+    # TODO refactor once there are any common system checks:
+    # - call script from systemd right after app start (instead of delayed timer)
+    # - get pid of app
+    # - perform system checks
+    # - wait ~ 3 min
+    # - check if app is still running and has same pid (i.e. didn't get auto-restarted)
+
     # Perform extra checks here.
     # If anything went wrong, reboot again until the bootlimit is reached
     # which triggers a rollback of the RootFs
+
+    # It's all good! Clear upgrade status and mark partition ok.
     fw_setenv upgrade_available
     fw_setenv bootcount 0
+    echo "System update successful. Marked current partition OK."
 fi

buildroot-external/board/remote/rootfs-overlay/etc/swupdate/reset-bootcount.sh

@@ -1,15 +1,30 @@
 #!/bin/sh
 
+systemctl is-active --quiet app || {
+  echo "Remote app not running!"
+  exit 1
+}
+
 ISUPGRADING=$(fw_printenv upgrade_available | awk -F'=' '{print $2}')
 echo "upgrade_available=$ISUPGRADING"
 if [ -z "$ISUPGRADING" ]
 then
-    echo "No RootFs update pending"
+    echo "No system update pending"
 else
-    echo "RootFs update pending, verifying system"
+    echo "System update pending, verifying system..."
+    # TODO refactor once there are any common system checks:
+    # - call script from systemd right after app start (instead of delayed timer)
+    # - get pid of app
+    # - perform system checks
+    # - wait ~ 3 min
+    # - check if app is still running and has same pid (i.e. didn't get auto-restarted)
+
     # Perform extra checks here.
     # If anything went wrong, reboot again until the bootlimit is reached
     # which triggers a rollback of the RootFs
+
+    # It's all good! Clear upgrade status and mark partition ok.
     fw_setenv upgrade_available
     fw_setenv bootcount 0
+    echo "System update successful. Marked current partition OK."
 fi

buildroot-external/rootfs-overlay/etc/systemd/system/app-update-bootcount.service

@@ -0,0 +1,8 @@
+[Unit]
+Description=Run bootcount reset check after app update script
+RefuseManualStart=no
+RefuseManualStop=no
+
+[Service]
+Type=oneshot
+ExecStart=/etc/swupdate/reset-bootcount.sh

buildroot-external/rootfs-overlay/etc/systemd/system/app-update-bootcount.timer

@@ -0,0 +1,8 @@
+[Unit]
+Description=Bootcount reset check after app update timer
+
+[Timer]
+OnBootSec=180
+
+[Install]
+WantedBy=multi-user.target

buildroot-external/rootfs-overlay/etc/systemd/system/app.service

@@ -3,9 +3,14 @@ Description=YIO remote app
 After=display-init.service
 
 [Service]
-Type=simple
+Type=exec
 ExecStart=/opt/yio/app-launch.sh
-RemainAfterExit=yes
+# Force reboot if app failed to startup 2 times within 60 seconds
+StartLimitIntervalSec=60
+StartLimitBurst=2
+Restart=always
+RestartSec=1
+StartLimitAction=reboot-force
 
 [Install]
 WantedBy=multi-user.target

buildroot-external/rootfs-overlay/etc/systemd/system/multi-user.target.wants/app-update-bootcount.timer

@@ -0,0 +1 @@
+../app-update-bootcount.timer

buildroot-external/rootfs-overlay/opt/yio/app-launch.sh

@@ -14,4 +14,5 @@ if [[ ! -d $YIO_APP_DIR ]] && [[ -d ${YIO_HOME}/app-previous ]]; then
     mv ${YIO_HOME}/app-previous $YIO_APP_DIR
 fi
 
-${YIO_APP_DIR}/remote &
+# Do not fork! Otherwise systemd unit service doesn't work anymore
+${YIO_APP_DIR}/remote

buildroot-external/rootfs-overlay/opt/yio/scripts/app-plugin-update.sh

@@ -151,8 +151,7 @@ fi
 # Replace old backup with the current app version
 #------------------------------------------------------------------------------
 log "Stopping remote app..."
-killall -9 remote >> $LOGFILE 2>&1 && sleep 2 || true
-#stopService app >> $LOGFILE 2>&1#
+stopService app >> $LOGFILE 2>&1
 
 #fbv -d 1 "${YIO_SPLASH_DIR}/update.png"
 
@@ -195,6 +194,4 @@ fbv -d 1 "${YIO_SPLASH_DIR}/splash.png"
 #TODO rather reboot? If yes: it would be a good time to check & repair file systems
 log "Update finished! Launching app..."
 
-# 'systemctl start app' doesn't work reliably!?
-# startService app
-$YIO_HOME/app-launch.sh >> /dev/null 2>&1
+startService app

buildroot-external/rootfs-overlay/opt/yio/scripts/app-update.sh

@@ -148,7 +148,7 @@ fi
 #------------------------------------------------------------------------------
 # Replace old backup with the current app version
 #------------------------------------------------------------------------------
-killall -9 remote >> $LOGFILE 2>&1 && sleep 2 || true
+stopService app >> $LOGFILE 2>&1
 
 if [[ -d $YIO_APP_DIR ]]; then
   YIO_BACKUP=${YIO_HOME}/app-previous
@@ -189,4 +189,4 @@ log "Update finished! Launching app..."
 
 fbv -d 1 "${YIO_SPLASH_DIR}/splash.png"
 
-$YIO_HOME/app-launch.sh >> /dev/null 2>&1
+startService app