Support prebuilt airplanes.live images in update and runtime scripts

Adds a parallel image-install branch to update.sh, gated on both the
boot config file and an executable airplanes-feeder. On image installs,
update.sh sources config from the boot partition, skips the readsb
compile, and orders its systemd units after airplanes-first-run.service;
manual installs follow the existing path unchanged. Runtime scripts and
the apl-feed CLI gain matching multi-source config handling, and both
unit files now set RestartPreventExitStatus=64 so a config-fatal exit no
longer respawns.

Author: d4rken

.github/workflows/ci.yml

@@ -91,3 +91,31 @@ jobs:
             -v "$PWD:/workspace:ro" \
             "$IMAGE" \
             bash /workspace/test/installer-smoke.sh
+
+  image-rootfs-smoke:
+    name: image rootfs smoke
+    runs-on: ubuntu-24.04
+    timeout-minutes: 20
+    steps:
+      - name: Checkout feed
+        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+        with:
+          persist-credentials: false
+          path: feed
+
+      - name: Checkout image updater
+        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+        with:
+          persist-credentials: false
+          repository: airplanes-live/airplanes-update
+          path: airplanes-update
+
+      - name: Run image rootfs smoke
+        run: |
+          docker run --rm \
+            -e AIRPLANES_FEED_DIR=/feed \
+            -e AIRPLANES_UPDATE_DIR=/airplanes-update \
+            -v "$PWD/feed:/feed:ro" \
+            -v "$PWD/airplanes-update:/airplanes-update:ro" \
+            debian:13-slim \
+            bash /feed/test/image-rootfs-smoke.sh

scripts/airplanes-feed.service

@@ -11,6 +11,7 @@ ExecStart=/usr/local/share/airplanes/airplanes-feed.sh
 Type=simple
 Restart=always
 RestartSec=30
+RestartPreventExitStatus=64
 StartLimitInterval=1
 StartLimitBurst=100
 SyslogIdentifier=airplanes-feed

scripts/airplanes-feed.sh

@@ -1,15 +1,31 @@
 #!/bin/bash
 
-if grep -qs -e 'LATITUDE' /boot/adsb-config.txt &>/dev/null && [[ -f /boot/airplanes-env ]]; then
-    source /boot/adsb-config.txt
-    source /boot/airplanes-env
+AIRPLANES_ROOT="${AIRPLANES_ROOT:-/}"
+airplanes_path() {
+    local path="$1"
+    if [[ "$AIRPLANES_ROOT" == "/" ]]; then
+        printf '%s' "$path"
+    else
+        printf '%s%s' "${AIRPLANES_ROOT%/}" "$path"
+    fi
+}
+
+BOOT_CONFIG="$(airplanes_path /boot/airplanes-config.txt)"
+BOOT_ENV="$(airplanes_path /boot/airplanes-env)"
+FEED_ENV="$(airplanes_path /etc/airplanes/feed.env)"
+IMAGE_FEED_BIN="$(airplanes_path /usr/bin/airplanes-feeder)"
+
+IMAGE_INSTALL=0
+if [[ -f "$BOOT_CONFIG" && -x "$IMAGE_FEED_BIN" ]]; then
+    IMAGE_INSTALL=1
+    source "$BOOT_CONFIG"
+    [[ -f "$BOOT_ENV" ]] && source "$BOOT_ENV"
 else
-    source /etc/airplanes/feed.env
+    source "$FEED_ENV"
 fi
 
-if ! [[ -d /run/airplanes-feed/ ]]; then
-    mkdir -p /run/airplanes-feed
-fi
+RUN_DIR="$(airplanes_path /run/airplanes-feed)"
+mkdir -p "$RUN_DIR"
 
 if [[ -z $INPUT ]]; then
     INPUT="127.0.0.1:30005"
@@ -27,21 +43,38 @@ UAT_IP=$(echo $UAT_INPUT | cut -d: -f1)
 UAT_PORT=$(echo $UAT_INPUT | cut -d: -f2)
 UAT_SOURCE="--net-connector $UAT_IP,$UAT_PORT,uat_in,silent_fail"
 
-if [ -f /boot/airplanes-config.txt ]; then
-    UUID_FILE="/boot/airplanes-uuid"
+if [[ -f "$BOOT_CONFIG" ]]; then
+    UUID_FILE="$(airplanes_path /boot/airplanes-uuid)"
+else
+    UUID_FILE="$(airplanes_path /usr/local/share/airplanes/airplanes-uuid)"
+fi
+
+REDUCE_INTERVAL="${REDUCE_INTERVAL:-0.5}"
+JSON_OPTIONS="${JSON_OPTIONS:-"--json-location-accuracy 2"}"
+MODEAC_OPTION=""
+if [[ "${MODEAC:-}" == "yes" ]]; then
+    MODEAC_OPTION="--modeac"
+fi
+
+if [[ "$IMAGE_INSTALL" == "1" ]]; then
+    FEED_BIN="${AIRPLANES_FEED_BIN:-$IMAGE_FEED_BIN}"
+    TARGET="${TARGET:-"--net-connector feed.airplanes.live,30004,beast_reduce_plus_out,feed2.airplanes.live,64004"}"
+    FEED_NET_OPTIONS="${FEED_NET_OPTIONS:-"--net-ro-interval 0.2"}"
+    FEED_IMAGE_OPTIONS="${FEED_IMAGE_OPTIONS:-"--db-file=none --max-range 450"}"
 else
-    UUID_FILE="/usr/local/share/airplanes/airplanes-uuid"
+    FEED_BIN="${AIRPLANES_FEED_BIN:-$(airplanes_path /usr/local/share/airplanes/feed-airplanes)}"
+    FEED_NET_OPTIONS="${FEED_NET_OPTIONS:-$NET_OPTIONS}"
+    FEED_IMAGE_OPTIONS=""
 fi
-    
-exec /usr/local/share/airplanes/feed-airplanes --net --net-only --quiet \
-    --uuid-file=$UUID_FILE \
-    --write-json /run/airplanes-feed \
+
+exec "$FEED_BIN" --net --net-only --quiet \
+    "--uuid-file=$UUID_FILE" \
+    --write-json "$RUN_DIR" \
+    $FEED_IMAGE_OPTIONS \
     --net-beast-reduce-interval $REDUCE_INTERVAL \
-    $TARGET $NET_OPTIONS \
+    $TARGET $FEED_NET_OPTIONS \
     --lat "$LATITUDE" --lon "$LONGITUDE" \
     $JSON_OPTIONS \
     $UAT_SOURCE \
     $SOURCE \
-
-
-
+    $MODEAC_OPTION

scripts/airplanes-mlat.service

@@ -11,6 +11,7 @@ ExecStart=/usr/local/share/airplanes/airplanes-mlat.sh
 Type=simple
 Restart=always
 RestartSec=30
+RestartPreventExitStatus=64
 StartLimitInterval=1
 StartLimitBurst=100
 SyslogIdentifier=airplanes-mlat

scripts/airplanes-mlat.sh

@@ -1,10 +1,32 @@
 #!/bin/bash
 
-if grep -qs -e 'LATITUDE' /boot/adsb-config.txt &>/dev/null && [[ -f /boot/airplanes-env ]]; then
-    source /boot/adsb-config.txt
-    source /boot/airplanes-env
+AIRPLANES_ROOT="${AIRPLANES_ROOT:-/}"
+airplanes_path() {
+    local path="$1"
+    if [[ "$AIRPLANES_ROOT" == "/" ]]; then
+        printf '%s' "$path"
+    else
+        printf '%s%s' "${AIRPLANES_ROOT%/}" "$path"
+    fi
+}
+
+BOOT_CONFIG="$(airplanes_path /boot/airplanes-config.txt)"
+BOOT_ENV="$(airplanes_path /boot/airplanes-env)"
+FEED_ENV="$(airplanes_path /etc/airplanes/feed.env)"
+
+if [[ -f "$BOOT_CONFIG" && -x "$(airplanes_path /usr/bin/airplanes-feeder)" ]]; then
+    source "$BOOT_CONFIG"
+    [[ -f "$BOOT_ENV" ]] && source "$BOOT_ENV"
+else
+    source "$FEED_ENV"
+fi
+
+if [[ "${MLAT_MARKER:-}" == "no" ]]; then
+    PRIVACY="--privacy"
+elif [[ -n "${MLAT_MARKER:-}" ]]; then
+    PRIVACY=""
 else
-    source /etc/airplanes/feed.env
+    PRIVACY="${PRIVACY:-}"
 fi
 
 if [[ "$LATITUDE" == 0 ]] || [[ "$LONGITUDE" == 0 ]] || [[ "$USER" == 0 ]] || [[ "$USER" == "disable" ]]; then
@@ -23,7 +45,7 @@ while ! nc -z "$INPUT_IP" "$INPUT_PORT" && command -v nc &>/dev/null; do
     sleep 10
 done
 
-exec /usr/local/share/airplanes/venv/bin/mlat-client \
+exec "$(airplanes_path /usr/local/share/airplanes/venv/bin/mlat-client)" \
     --input-type "$INPUT_TYPE" --no-udp \
     --input-connect "$INPUT" \
     --server "$MLATSERVER" \
@@ -32,5 +54,5 @@ exec /usr/local/share/airplanes/venv/bin/mlat-client \
     --lon "$LONGITUDE" \
     --alt "$ALTITUDE" \
     $PRIVACY \
-    $UUID_FILE \
+    ${UUID_FILE:-} \
     $RESULTS $RESULTS1 $RESULTS2 $RESULTS3 $RESULTS4

scripts/apl-feed/common.sh

@@ -78,9 +78,25 @@ secret_version_path() {
 }
 
 feed_env_path() {
+    if [[ -f "$(root_path '/boot/airplanes-config.txt')" && -x "$(root_path '/usr/bin/airplanes-feeder')" ]]; then
+        root_path '/boot/airplanes-config.txt'
+        return
+    fi
     root_path '/etc/airplanes/feed.env'
 }
 
+feed_env_paths() {
+    if [[ -f "$(root_path '/boot/airplanes-config.txt')" && -x "$(root_path '/usr/bin/airplanes-feeder')" ]]; then
+        root_path '/boot/airplanes-config.txt'
+        printf '\n'
+        root_path '/boot/airplanes-env'
+        printf '\n'
+        return
+    fi
+    feed_env_path
+    printf '\n'
+}
+
 require_jq() {
     command -v jq >/dev/null 2>&1 || die "jq is required"
 }
@@ -149,14 +165,19 @@ read_version_file() {
 
 feed_env_get() {
     local key="$1"
-    local path
-    path="$(feed_env_path)"
-    [[ -f "$path" ]] || return 1
-    sed -n \
-        -e "s/^${key}=\"\\(.*\\)\"[[:space:]]*$/\\1/p" \
-        -e "s/^${key}='\\(.*\\)'[[:space:]]*$/\\1/p" \
-        -e "s/^${key}=\\([^#[:space:]]*\\).*$/\\1/p" \
-        "$path" | tail -n 1
+    local path output
+    output="$(
+        while IFS= read -r path; do
+            [[ -f "$path" ]] || continue
+            sed -n \
+                -e "s/^${key}=\"\\(.*\\)\"[[:space:]]*$/\\1/p" \
+                -e "s/^${key}='\\(.*\\)'[[:space:]]*$/\\1/p" \
+                -e "s/^${key}=\\([^#[:space:]]*\\).*$/\\1/p" \
+                "$path"
+        done < <(feed_env_paths)
+    )"
+    [[ -n "$output" ]] || return 1
+    printf '%s\n' "$output" | tail -n 1
 }
 
 read_uuid() {

scripts/lib/install-update-common.sh

@@ -29,6 +29,14 @@ airplanes_init_paths() {
     SYSTEMD_DIR="$(airplanes_path /lib/systemd/system)"
 }
 
+airplanes_is_image_install() {
+    [[ -f "$BOOT_CONFIG" && -x "$(airplanes_path /usr/bin/airplanes-feeder)" ]]
+}
+
+airplanes_image_target_default() {
+    printf '%s' '--net-connector feed.airplanes.live,30004,beast_reduce_plus_out,feed2.airplanes.live,64004'
+}
+
 airplanes_require_root() {
     if [[ "${AIRPLANES_SKIP_ROOT_CHECK:-0}" == "1" ]]; then
         return 0

scripts/second-mlat.sh

@@ -39,7 +39,9 @@ Nice=-1
 WantedBy=default.target
 EOF
 
-if [[ -f /boot/adsb-config.txt ]]; then
+if [[ -f /boot/airplanes-config.txt ]]; then
+    sed -i -e 's#EnvironmentFile.*#EnvironmentFile=/boot/airplanes-env\nEnvironmentFile=/boot/airplanes-config.txt#' "$SERVICE"
+elif [[ -f /boot/adsb-config.txt ]]; then
     sed -i -e 's#EnvironmentFile.*#EnvironmentFile=/boot/airplanes-env\nEnvironmentFile=/boot/adsb-config.txt#' "$SERVICE"
 fi