Docker VM: take the imported disk from vm_import_disk

Same parser as haos-vm: PVE 9.2's import message and the pvesm fallback both missed the new volume.

ct/aurral.sh

@@ -37,16 +37,19 @@ function update_script() {
     msg_ok "Stopped Service"
 
     CLEAN_INSTALL=1 fetch_and_deploy_gh_release "aurral" "lklynet/aurral" "tarball"
-    NODE_VERSION="26" NODE_MODULE="pnpm" setup_nodejs
-    ensure_dependencies git
+    NODE_VERSION="26" setup_nodejs
 
     msg_info "Updating Aurral"
     cd /opt/aurral
     export VITE_APP_VERSION="$(cat ~/.aurral)"
     export VITE_GITHUB_REPO="lklynet/aurral"
     export VITE_RELEASE_CHANNEL="stable"
-    $STD pnpm install --frozen-lockfile --config.engine-strict=false --filter aurral-frontend --filter aurral-backend
-    $STD pnpm --filter aurral-frontend run build
+    # aurral's .npmrc sets engine-strict=true and pins an exact node patch (e.g. 26.8.x),
+    # which NodeSource can't match since it only ships the latest patch per major.
+    export npm_config_engine_strict=false
+    $STD npm ci --workspace frontend --include-workspace-root=false
+    $STD npm run build --workspace frontend
+    $STD npm ci --workspace backend --omit=dev --include=optional --include-workspace-root=false
     mkdir -p /opt/aurral_data
     cat <<EOF >/opt/aurral/aurral.env
 NODE_ENV=production
@@ -54,8 +57,6 @@ PORT=3001
 AURRAL_DATA_DIR=/opt/aurral_data
 APP_VERSION=$(cat ~/.aurral)
 EOF
-    sed -i 's#backend/server.js#backend/server.ts#' /etc/systemd/system/aurral.service
-    systemctl daemon-reload
     msg_ok "Updated Aurral"
 
     msg_info "Starting Service"

install/aurral-install.sh

@@ -16,14 +16,13 @@ update_os
 msg_info "Installing Dependencies"
 $STD apt install -y \
   build-essential \
-  git \
   python3 \
   ffmpeg \
   fontconfig \
   fonts-dejavu-core
 msg_ok "Installed Dependencies"
 
-NODE_VERSION="26" NODE_MODULE="pnpm" setup_nodejs
+NODE_VERSION="26" setup_nodejs
 
 fetch_and_deploy_gh_release "yt-dlp" "yt-dlp/yt-dlp" "singlefile" "latest" "/usr/local/bin" "yt-dlp"
 fetch_and_deploy_gh_release "aurral" "lklynet/aurral" "tarball"
@@ -33,8 +32,12 @@ cd /opt/aurral
 export VITE_APP_VERSION="$(cat ~/.aurral)"
 export VITE_GITHUB_REPO="lklynet/aurral"
 export VITE_RELEASE_CHANNEL="stable"
-$STD pnpm install --frozen-lockfile --config.engine-strict=false --filter aurral-frontend --filter aurral-backend
-$STD pnpm --filter aurral-frontend run build
+# aurral's .npmrc sets engine-strict=true and pins an exact node patch (e.g. 26.8.x),
+# which NodeSource can't match since it only ships the latest patch per major.
+export npm_config_engine_strict=false
+$STD npm ci --workspace frontend --include-workspace-root=false
+$STD npm run build --workspace frontend
+$STD npm ci --workspace backend --omit=dev --include=optional --include-workspace-root=false
 msg_ok "Built Aurral"
 
 msg_info "Creating Service"
@@ -55,7 +58,7 @@ Type=simple
 User=root
 WorkingDirectory=/opt/aurral
 EnvironmentFile=/opt/aurral/aurral.env
-ExecStart=/usr/bin/node backend/server.ts
+ExecStart=/usr/bin/node backend/server.js
 Restart=on-failure
 RestartSec=5
 

vm/docker-vm.sh

@@ -391,24 +391,7 @@ msg_ok "Created VM shell"
 # ==============================================================================
 # DISK IMPORT
 # ==============================================================================
-msg_info "Importing disk into storage ($STORAGE)"
-
-if qm disk import --help >/dev/null 2>&1; then
-  IMPORT_CMD=(qm disk import)
-else
-  IMPORT_CMD=(qm importdisk)
-fi
-
-IMPORT_OUT="$("${IMPORT_CMD[@]}" "$VMID" "$WORK_FILE" "$STORAGE" ${DISK_IMPORT:-} 2>&1 || true)"
-DISK_REF_IMPORTED="$(printf '%s\n' "$IMPORT_OUT" | sed -n "s/.*successfully imported disk '\([^']\+\)'.*/\1/p" | tr -d "\r\"'")"
-[[ -z "$DISK_REF_IMPORTED" ]] && DISK_REF_IMPORTED="$(pvesm list "$STORAGE" | awk -v id="$VMID" '$5 ~ ("vm-"id"-disk-") {print $1":"$5}' | sort | tail -n1)"
-[[ -z "$DISK_REF_IMPORTED" ]] && {
-  msg_error "Unable to determine imported disk reference."
-  echo "$IMPORT_OUT"
-  exit 226
-}
-
-msg_ok "Imported disk (${CL}${BL}${DISK_REF_IMPORTED}${CL})"
+vm_import_disk "$VMID" "$WORK_FILE" "$STORAGE" "${DISK_IMPORT#--format }" || exit 226
 
 # Clean up work file
 rm -f "$WORK_FILE"
@@ -420,7 +403,7 @@ msg_info "Attaching EFI and root disk"
 
 qm set "$VMID" \
   --efidisk0 "${STORAGE}:0,efitype=4m" \
-  --scsi0 "${DISK_REF_IMPORTED},${DISK_CACHE}${THIN%,}" \
+  --scsi0 "${VM_IMPORTED_DISK},${DISK_CACHE}${THIN%,}" \
   --boot order=scsi0 \
   --serial0 socket >/dev/null