Package

package/zero/Dockerfile

@@ -1,6 +1,6 @@
 FROM debian:trixie-slim
 
-LABEL org.khodo.product=product-vamp-zero
+LABEL org.khodo.product=product_vamp_zero
 
 ENV DEBIAN_FRONTEND=noninteractive
 
@@ -26,4 +26,4 @@ RUN apt-get update \
 COPY usr/ /usr/
 
 ENTRYPOINT ["/usr/bin/tini", "--"]
-CMD ["/usr/bin/vamp-zero", "--config", "/etc/product-vamp/vamp.json"]
+CMD ["/usr/bin/vamp_zero", "--config", "/etc/product_vamp/vamp.json"]

package/zero/install_zero.sh

@@ -3,24 +3,31 @@ set -euo pipefail
 
 bundle_dir=$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)
 zero_dir="$bundle_dir/zero"
-image_tar="$zero_dir/product-vamp-zero-linux-arm64.docker.tar"
-config_dir=/etc/product-vamp
-state_dir=/var/lib/product-vamp
-run_dir=/run/product-vamp
-share_dir=/usr/share/product-vamp
+image_tar="$zero_dir/product_vamp_zero_linux_arm64.docker.tar"
+config_dir=/etc/product_vamp
+state_dir=/var/lib/product_vamp
+run_dir=/run/product_vamp
+share_dir=/usr/share/product_vamp
 image_tag=
-connection=product-vamp-control
+connection=product_vamp_control
 replacement_started=false
 image_loaded=false
 previous_image=
 stage_dir=
+legacy_targets=(
+  /etc/product-vamp /var/lib/product-vamp /run/product-vamp /usr/share/product-vamp
+  /usr/local/bin/product-vamp-start-ap /usr/local/bin/product-vamp-start-zero
+  /etc/systemd/system/product-vamp-ap.service /etc/systemd/system/product-vamp-zero.service
+  /etc/systemd/system/product-vamp-ap.service.d /etc/systemd/system/product-vamp-zero.service.d
+  /run/systemd/system/product-vamp-ap.service.d /run/systemd/system/product-vamp-zero.service.d
+)
 
 cleanup() {
   status=$?
   trap - EXIT
   if [ "$status" -ne 0 ] && [ "$replacement_started" = true ]; then
-    systemctl stop product-vamp-zero.service product-vamp-ap.service >/dev/null 2>&1 || true
-    docker rm -f product-vamp-zero >/dev/null 2>&1 || true
+    systemctl stop product_vamp_zero.service product_vamp_ap.service >/dev/null 2>&1 || true
+    docker rm -f product_vamp_zero >/dev/null 2>&1 || true
     nmcli connection down "$connection" >/dev/null 2>&1 || true
     echo "Installation failed; Product Vamp services are stopped. Rerun the installer." >&2
   elif [ "$status" -ne 0 ] && [ "$image_loaded" = true ] && [ -n "$previous_image" ]; then
@@ -61,7 +68,7 @@ required_packages=(
 )
 
 if [ "$(id -u)" -ne 0 ]; then
-  echo "install-zero.sh must be run as root" >&2
+  echo "install_zero.sh must be run as root" >&2
   exit 1
 fi
 
@@ -83,12 +90,12 @@ else
   echo "Installing missing OS packages: ${missing_packages[*]}"
   if ! apt-get update -o APT::Update::Error-Mode=any; then
     echo "Failed to refresh apt package indexes." >&2
-    echo "Connect the Zero to upstream internet, then rerun sudo zero/install-zero.sh." >&2
+    echo "Connect the Zero to upstream internet, then rerun sudo zero/install_zero.sh." >&2
     exit 1
   fi
   if ! apt-get install -y --no-install-recommends "${missing_packages[@]}"; then
     echo "Failed to install required OS packages: ${missing_packages[*]}" >&2
-    echo "Connect the Zero to upstream internet, then rerun sudo zero/install-zero.sh." >&2
+    echo "Connect the Zero to upstream internet, then rerun sudo zero/install_zero.sh." >&2
     exit 1
   fi
 fi
@@ -119,24 +126,25 @@ mapfile -t image_fields <<< "$image_details"
 image_tag=${image_fields[0]}
 expected_image=${image_fields[1]}
 
-for target in "$config_dir" "$state_dir" "$run_dir" "$share_dir" \
-  /usr/local/bin/product-vamp-start-ap /usr/local/bin/product-vamp-start-zero \
-  /etc/systemd/system/product-vamp-ap.service.d /etc/systemd/system/product-vamp-zero.service.d \
-  /run/systemd/system/product-vamp-ap.service.d /run/systemd/system/product-vamp-zero.service.d \
-  /etc/systemd/system/product-vamp-ap.service /etc/systemd/system/product-vamp-zero.service; do
+for target in "${legacy_targets[@]}" "$config_dir" "$state_dir" "$run_dir" "$share_dir" \
+  /usr/local/bin/product_vamp_start_ap /usr/local/bin/product_vamp_start_zero \
+  /etc/systemd/system/product_vamp_ap.service.d /etc/systemd/system/product_vamp_zero.service.d \
+  /run/systemd/system/product_vamp_ap.service.d /run/systemd/system/product_vamp_zero.service.d \
+  /etc/systemd/system/product_vamp_ap.service /etc/systemd/system/product_vamp_zero.service; do
   validate_target "$target"
 done
 
-stage_dir=$(mktemp -d /tmp/product-vamp-install-XXXXXX)
+stage_dir=$(mktemp -d /tmp/product_vamp_install_XXXXXX)
 install -m 0644 "$zero_dir/config/vamp.example.json" "$stage_dir/vamp.json"
-install -m 0755 "$zero_dir/start-ap.sh" "$stage_dir/start-ap.sh"
-install -m 0755 "$zero_dir/start-zero.sh" "$stage_dir/start-zero.sh"
-install -m 0644 "$zero_dir/systemd/product-vamp-ap.service" "$stage_dir/product-vamp-ap.service"
-install -m 0644 "$zero_dir/systemd/product-vamp-zero.service" "$stage_dir/product-vamp-zero.service"
-bash -n "$stage_dir/start-ap.sh"
-bash -n "$stage_dir/start-zero.sh"
+install -m 0755 "$zero_dir/start_ap.sh" "$stage_dir/start_ap.sh"
+install -m 0755 "$zero_dir/start_zero.sh" "$stage_dir/start_zero.sh"
+install -m 0644 "$zero_dir/systemd/product_vamp_ap.service" "$stage_dir/product_vamp_ap.service"
+install -m 0644 "$zero_dir/systemd/product_vamp_zero.service" "$stage_dir/product_vamp_zero.service"
+bash -n "$stage_dir/start_ap.sh"
+bash -n "$stage_dir/start_zero.sh"
 previous_image=$(docker image inspect --format '{{.Id}}' "$image_tag" 2>/dev/null || true)
-previous_images=$(docker image ls --quiet --no-trunc --filter label=org.khodo.product=product-vamp-zero)
+previous_images=$(docker image ls --quiet --no-trunc --filter label=org.khodo.product=product_vamp_zero)
+legacy_images=$(docker image ls --quiet --no-trunc --filter label=org.khodo.product=product-vamp-zero)
 image_loaded=true
 docker load -i "$image_tar"
 new_image=$(docker image inspect --format '{{.Id}}' "$image_tag")
@@ -146,45 +154,50 @@ if [ "$new_image" != "$expected_image" ]; then
 fi
 # Probe the actual image and staged configuration without touching host state or hardware.
 docker run --rm --network none --mount "type=bind,src=$stage_dir,dst=/install,readonly" \
-  "$new_image" /usr/bin/vamp-zero --config /install/vamp.json --once
+  "$new_image" /usr/bin/vamp_zero --config /install/vamp.json --once
 
 echo "Resetting all Product Vamp data and settings, including control Wi-Fi credentials."
 echo "A connection through the control Wi-Fi may disconnect."
 replacement_started=true
-for service in product-vamp-zero.service product-vamp-ap.service; do
+for service in product_vamp_zero.service product_vamp_ap.service product-vamp-zero.service product-vamp-ap.service; do
   if systemctl cat "$service" >/dev/null 2>&1; then
     systemctl stop "$service"
+    systemctl disable "$service"
   fi
 done
-if docker container inspect product-vamp-zero >/dev/null 2>&1; then
-  docker rm -f product-vamp-zero
-fi
-for target in "$config_dir" "$state_dir" "$run_dir" "$share_dir" \
-  /etc/systemd/system/product-vamp-ap.service.d /etc/systemd/system/product-vamp-zero.service.d \
-  /run/systemd/system/product-vamp-ap.service.d /run/systemd/system/product-vamp-zero.service.d; do
+for container in product_vamp_zero product-vamp-zero; do
+  if docker container inspect "$container" >/dev/null 2>&1; then
+    docker rm -f "$container"
+  fi
+done
+for target in "${legacy_targets[@]}" "$config_dir" "$state_dir" "$run_dir" "$share_dir" \
+  /etc/systemd/system/product_vamp_ap.service.d /etc/systemd/system/product_vamp_zero.service.d \
+  /run/systemd/system/product_vamp_ap.service.d /run/systemd/system/product_vamp_zero.service.d; do
   validate_target "$target"
   rm -rf --one-file-system -- "$target"
 done
 install -d -m 0755 "$config_dir" "$run_dir"
 install -m 0644 "$stage_dir/vamp.json" "$config_dir/vamp.json"
-printf '%s\n' "$new_image" > "$config_dir/image-id"
-install -m 0755 "$stage_dir/start-ap.sh" /usr/local/bin/product-vamp-start-ap
-install -m 0755 "$stage_dir/start-zero.sh" /usr/local/bin/product-vamp-start-zero
-install -m 0644 "$stage_dir/product-vamp-ap.service" /etc/systemd/system/product-vamp-ap.service
-install -m 0644 "$stage_dir/product-vamp-zero.service" /etc/systemd/system/product-vamp-zero.service
+printf '%s\n' "$new_image" > "$config_dir/image_id"
+install -m 0755 "$stage_dir/start_ap.sh" /usr/local/bin/product_vamp_start_ap
+install -m 0755 "$stage_dir/start_zero.sh" /usr/local/bin/product_vamp_start_zero
+install -m 0644 "$stage_dir/product_vamp_ap.service" /etc/systemd/system/product_vamp_ap.service
+install -m 0644 "$stage_dir/product_vamp_zero.service" /etc/systemd/system/product_vamp_zero.service
 
-if nmcli -t -f NAME connection show | grep -Fxq "$connection"; then
-  nmcli connection delete "$connection"
-fi
+for profile in "$connection" product-vamp-control; do
+  if nmcli -t -f NAME connection show | grep -Fxq "$profile"; then
+    nmcli connection delete "$profile"
+  fi
+done
 systemctl daemon-reload
 systemctl disable --now getty@tty1.service >/dev/null 2>&1 || true
 systemctl enable --now getty@tty2.service >/dev/null 2>&1 || true
-systemctl enable --now product-vamp-ap.service
-systemctl enable product-vamp-zero.service
-systemctl restart product-vamp-zero.service
+systemctl enable --now product_vamp_ap.service
+systemctl enable product_vamp_zero.service
+systemctl restart product_vamp_zero.service
 healthy=false
 for attempt in $(seq 1 60); do
-  if docker exec product-vamp-zero /usr/bin/vamp-zero --config /etc/product-vamp/vamp.json --health-check; then
+  if docker exec product_vamp_zero /usr/bin/vamp_zero --config /etc/product_vamp/vamp.json --health-check; then
     healthy=true
     break
   fi
@@ -194,7 +207,7 @@ if [ "$healthy" != true ]; then
   echo "Product Vamp did not become healthy after installation." >&2
   exit 1
 fi
-for image in $(printf '%s\n' "$previous_image" "$previous_images" | sort -u); do
+for image in $(printf '%s\n' "$previous_image" "$previous_images" "$legacy_images" | sort -u); do
   if [ "$image" != "$new_image" ]; then
     if [ -z "$(docker ps -aq --filter "ancestor=$image")" ]; then
       docker image rm "$image" || echo "Warning: could not remove old Product Vamp image $image" >&2

package/zero/product_vamp_ap.service

@@ -6,7 +6,7 @@ Requires=NetworkManager.service
 [Service]
 Type=oneshot
 RemainAfterExit=yes
-ExecStart=/usr/local/bin/product-vamp-start-ap
+ExecStart=/usr/local/bin/product_vamp_start_ap
 
 [Install]
 WantedBy=multi-user.target

package/zero/product_vamp_zero.service

@@ -1,7 +1,7 @@
 [Unit]
 Description=Product Vamp Zero display and control service
-After=docker.service product-vamp-ap.service getty@tty1.service
-Requires=docker.service product-vamp-ap.service
+After=docker.service product_vamp_ap.service getty@tty1.service
+Requires=docker.service product_vamp_ap.service
 Conflicts=getty@tty1.service
 
 [Service]
@@ -14,9 +14,9 @@ TTYVTDisallocate=yes
 StandardInput=tty-force
 StandardOutput=journal
 StandardError=journal
-ExecStartPre=/usr/bin/install -d -m 0755 /run/product-vamp
-ExecStart=/usr/local/bin/product-vamp-start-zero
-ExecStop=/bin/sh -c '/usr/bin/docker stop product-vamp-zero >/dev/null 2>&1 || true'
+ExecStartPre=/usr/bin/install -d -m 0755 /run/product_vamp
+ExecStart=/usr/local/bin/product_vamp_start_zero
+ExecStop=/bin/sh -c '/usr/bin/docker stop product_vamp_zero >/dev/null 2>&1 || true'
 
 [Install]
 WantedBy=multi-user.target

package/zero/start_ap.sh

@@ -1,12 +1,12 @@
 #!/usr/bin/env bash
 set -euo pipefail
 
-config=${PRODUCT_VAMP_CONFIG:-/etc/product-vamp/vamp.json}
+config=${PRODUCT_VAMP_CONFIG:-/etc/product_vamp/vamp.json}
 ssid=${PRODUCT_VAMP_AP_SSID:-Vamp Control}
 passphrase=${PRODUCT_VAMP_AP_PASSPHRASE:-vamp-control}
 interface=${PRODUCT_VAMP_AP_INTERFACE:-wlan0}
 cidr=${PRODUCT_VAMP_ZERO_CIDR:-192.168.42.1/24}
-connection=${PRODUCT_VAMP_AP_CONNECTION:-product-vamp-control}
+connection=${PRODUCT_VAMP_AP_CONNECTION:-product_vamp_control}
 
 configure_connection() {
   nmcli connection modify "$connection" \

package/zero/start_zero.sh

@@ -1,13 +1,13 @@
 #!/usr/bin/env bash
 set -euo pipefail
 
-container_name=${PRODUCT_VAMP_ZERO_CONTAINER:-product-vamp-zero}
-config_dir=${PRODUCT_VAMP_CONFIG_DIR:-/etc/product-vamp}
+container_name=${PRODUCT_VAMP_ZERO_CONTAINER:-product_vamp_zero}
+config_dir=${PRODUCT_VAMP_CONFIG_DIR:-/etc/product_vamp}
 image_tag=${PRODUCT_VAMP_ZERO_IMAGE:-}
 if [ -z "$image_tag" ]; then
-  read -r image_tag < "$config_dir/image-id"
+  read -r image_tag < "$config_dir/image_id"
 fi
-run_dir=${PRODUCT_VAMP_RUN_DIR:-/run/product-vamp}
+run_dir=${PRODUCT_VAMP_RUN_DIR:-/run/product_vamp}
 display_tty=${PRODUCT_VAMP_DISPLAY_TTY:-/dev/tty1}
 
 install -d -m 0755 "$run_dir"
@@ -37,7 +37,7 @@ echo "Starting Product Vamp Zero container '$container_name' from '$image_tag' o
 
 exec docker run --rm --name "$container_name" --network host --privileged \
   --env PRODUCT_VAMP_DISPLAY_TTY="$display_tty" \
-  -v "$config_dir:/etc/product-vamp:ro" \
-  -v "$run_dir:/run/product-vamp" \
+  -v "$config_dir:/etc/product_vamp:ro" \
+  -v "$run_dir:/run/product_vamp" \
   "$image_tag" \
-  sh -lc 'display_tty=${PRODUCT_VAMP_DISPLAY_TTY:-/dev/tty1}; exec setsid --wait --ctty /usr/bin/vamp-zero --config /etc/product-vamp/vamp.json < "$display_tty"'
+  sh -lc 'display_tty=${PRODUCT_VAMP_DISPLAY_TTY:-/dev/tty1}; exec setsid --wait --ctty /usr/bin/vamp_zero --config /etc/product_vamp/vamp.json < "$display_tty"'