refact+fix: dialogs and hostname

Author: simonwalz

system/cuos/dialog-maintenance.sh

@@ -183,7 +183,7 @@ diagnostics_menu() {
       resources) check_resources ;;
       clogs) term_all cuos_logs ;;
       logs) term_all view_logs ;;
-      docker) api_stream "docker ps" docker ps ;;
+      docker) api_stream "docker ps" 30 120 docker ps ;;
       ping) diagnostics_ping ;;
       dns) diagnostics_dns ;;
       "expert") expert ;;
@@ -202,23 +202,24 @@ cuos_logs() {
   (
     echo -e "\033[1;36m[ Log View - Press 'Q' to quit the view ]\033[0m";
     SYSTEMD_COLORS=true journalctl \
-      -t cuos \
-      --priority "emerg".."info" \
+      --identifier=cuos \
+      --priority="emerg".."info" \
       --lines=2000 \
       --output=short \
       --no-hostname \
       --no-pager
   ) | \
     LESSSECURE=1 less \
       --header=1,0 \
+      -R \
       +G
 }
 
 view_logs() {
   (
     echo -e "\033[1;36m[ Log View - Press 'Q' to quit the view ]\033[0m";
     SYSTEMD_COLORS=true journalctl \
-      --priority "emerg".."info" \
+      --priority="emerg".."info" \
       --lines=10000 \
       --output=short \
       --no-hostname \

system/cuos/dialog-reports.sh

@@ -16,7 +16,14 @@ change_vt
 
   tmpfile=$(mktemp)
 
-  journalctl -f -t cuos -n 12 --output=json | jq --unbuffered -r '
+  journalctl \
+    --identifier=cuos \
+    --merge \
+    --follow \
+    --lines=20 \
+    --boot=all \
+    --no-pager \
+    --output=json | jq --unbuffered -r '
     . as $e
     | (($e.__REALTIME_TIMESTAMP | tonumber) / 1000000 | strflocaltime("%Y-%m-%d %H:%M:%S")) + " [" +
       (["emerg","alert","crit","err","warning","notice","info","debug"][$e.PRIORITY | tonumber]) + "] " +
@@ -27,7 +34,7 @@ change_vt
   term cuos_dialog \
     --title "System Reports" \
     --exit-label "Intervention: Start configuration" \
-    --tailbox "$tmpfile" 30 70
+    --tailbox "$tmpfile" 40 100
   EXIT_CODE_DIALOG="$?"
 
   kill "$JOURNAL_PID"

system/cuos/do-update.sh

@@ -77,9 +77,10 @@ echo "Exit Code: ${DOCKER_EXIT_CODE}"
 
 docker network rm cuos-internet
 
+PARTITION_NEXT="A"
+[[ "${PARTITION}" == "A" ]] && PARTITION_NEXT="B"
+
 if [[ "${DOCKER_EXIT_CODE}" = "0" ]]; then
-  PARTITION_NEXT="A"
-  [[ "${PARTITION}" == "A" ]] && PARTITION_NEXT="B"
   touch "/data/run-update"
   state '.state' 'updating'
   state jq '.last_update_date = (now | todate)'
@@ -92,6 +93,9 @@ if [[ "${DOCKER_EXIT_CODE}" = "0" ]]; then
 elif [[ "${DOCKER_EXIT_CODE}" = "2" ]]; then
   echo "No new image version available."
   report_info "cuos:update:not_needed" "No new image version available"
+elif [[ "${DOCKER_EXIT_CODE}" = "3" ]]; then
+  echo "Not enough free disk space available"
+  report_info "cuos:update:no_space" "Not enough free disk space available"
 else
   state '.update_state' "update of partition ${PARTITION_NEXT} to ${OS_IMAGE}:${OS_VERSION} failed"
   report_err "cuos:update:failed" "Update failed. Exit code ${DOCKER_EXIT_CODE}"

system/cuos/init.sh

@@ -98,6 +98,9 @@ set_hostname() {
       r1=$(printf "%02X" $(( RANDOM % 256 )))
       r2=$(printf "%02X" $(( RANDOM % 256 )))
       SYSTEM_HOSTNAME="device-${r1}${r2}"
+      jq_replace \
+        --arg hn "${SYSTEM_HOSTNAME}" \
+        '.hostname = $hn'
   fi
   if [[ -n "${SYSTEM_HOSTNAME}" ]]; then
     echo "Setting hostname to $SYSTEM_HOSTNAME"

system/cuos/lib-dialog.sh

@@ -102,6 +102,15 @@ api_stream() {
   prgbox "$*" "$title" 22 90
 }
 
+api_stream_size() {
+  # Stream API output in prgbox
+  # Usage: api_stream <title> <h> <w> <action> [args...]
+  local title="$1"; shift
+  local h="$1"; shift
+  local w="$1"; shift
+  prgbox "$*" "$title" "$h" "$w"
+}
+
 yesno()     { dialog --backtitle "$BACKTITLE" --title "${2:-Confirm}" --yesno "$1" ${3:-9} ${4:-70}; }
 
 valid_hostname() {

updater/perform_update.sh

@@ -23,7 +23,7 @@ if [[ "${INSTALLIMAGE}" != "true" ]]; then
 	AVAIL_BYTES=$(df -B1 "${TARGET_ROOT}" | awk 'NR==2 {print $4}')
 	REQUIRED_BYTES=$((2 * 1024 * 1024 * 1024))
 	if [ "$AVAIL_BYTES" -le "$REQUIRED_BYTES" ]; then
-		echo "Not enough free space in ${TARGET_ROOT} (required: >2GB, available: $((AVAIL_BYTES/1024/1024)) MB). Aborting update."
+		echo "Not enough free space in ${TARGET_ROOT} (required: >2GB, available: $((AVAIL_BYTES/1024/1024)) MB). Aborting update." >&2
 		exit 3
 	fi
 fi
@@ -96,17 +96,15 @@ CONTAINER_ID="$(docker inspect --format '{{ .Id }}' "${CONTAINER_NAME}")" \
 	|| raise "Failed to get container id"
 
 if [ -z "${CONTAINER_ID}" ]; then
-	echo "Container not found: ${CONTAINER_NAME}"
-	exit 2
+	raise "Container not found: ${CONTAINER_NAME}"
 fi
 
 CONTAINER_ROOTFS_FS="$(jq -r '.config.rootfs' \
 	"/var/run/docker/runtime-runc/moby/${CONTAINER_ID}/state.json")" \
 	|| raise "Failed to get container rootfs"
 
 if [ -z "${CONTAINER_ROOTFS_FS}" ]; then
-	echo "Rootfs not found: ${CONTAINER_NAME}"
-	exit 2
+	raise "Rootfs not found: ${CONTAINER_NAME}"
 fi
 
 CONTAINER_ROOTFS="@os/docker/${CONTAINER_ROOTFS_FS#"${DOCKER_DIR}/"}"