refact: app-init and factory-reset

Author: simonwalz

system/cuos/api.sh

@@ -154,6 +154,7 @@ EOF
   "factory-reset")
     report_notice "cuos:useraction:factory-reset" "Factory reset triggered by the user"
     setsid "${SCRIPT_DIR}/do-factory-reset.sh" >/data/log/factory-reset.log 2>&1 &
+    tail -f /data/log/factory-reset.log
   ;;
 
 ## reboot             - Reboot the system

system/cuos/app-init.sh

@@ -126,16 +126,17 @@ done
 IMAGE_RUNNING=$(docker image inspect --format '{{index .RepoDigests 0}}' "${INITIAL_IMAGE}" 2>/dev/null | cut -d'@' -f2)
 
 UPDATE=0
-if [[ -f "/data/run-update" || -z "${IMAGE_RUNNING}" ]]; then
-  if download_image "${INITIAL_IMAGE}" "${INITIAL_DIGEST}"; then
-    docker rm -f "${CONTAINER_NAME}" 2>/dev/null || true
-  fi
+if [[ -f "/data/run-update" ]]; then
   UPDATE=1
-
   rm -f "/data/run-update"
 fi
 export UPDATE
 
+if [[ "${UPDATE}" = "1" || -z "${IMAGE_RUNNING}" ]]; then
+  if download_image "${INITIAL_IMAGE}" "${INITIAL_DIGEST}"; then
+    docker rm -f "${CONTAINER_NAME}" 2>/dev/null || true
+  fi
+fi
 
 
 # Check whether the container is running

system/cuos/do-factory-reset.sh

@@ -11,17 +11,17 @@ docker system prune -f
 
 sync
 
-systemctl stop cuos-app-init docker docker.socket
-
-
 echo "Cleaning up @data"
+rm /data/* 2>/dev/null
 for dir in /data/*/; do
   if [[ -d "$dir" && "$dir" != "/data/dhcp/" ]]; then
     echo "Cleaning inside $dir..."
     rm -Rf "${dir:?}"/{*,.*}
   fi
 done
 
+rm /etc/hostname
+
 sync
 
 /sbin/reboot