Qualitätsprüfungen und Fehlerpfade härten

scripts/install-usb.sh

@@ -1,14 +1,13 @@
 #!/usr/bin/env bash
 # DESTRUCTIVE: explicitly invoked, strongly confirmed, never automatic.
 set -Eeuo pipefail
-ROOT=$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)
 DEVICE=${1:-}
 ISO=${2:-}
 if [[ ! "$DEVICE" =~ ^/dev/[a-zA-Z0-9/_-]+$ || ! -f "$ISO" ]]; then
  echo "Usage: sudo bash scripts/install-usb.sh /dev/sdb /absolute/path/to/pc-intake.iso" >&2; exit 2
 fi
 [[ $EUID -eq 0 ]] || { echo 'Run as root.' >&2; exit 2; }
-for cmd in lsblk blkid sgdisk mkfs.vfat mkfs.ext4 grub-install mount umount findmnt wipefs dd sync awk bsdtar blockdev partprobe udevadm; do
+for cmd in lsblk sgdisk mkfs.vfat mkfs.ext4 grub-install mount umount findmnt wipefs sync bsdtar blockdev partprobe udevadm; do
  command -v "$cmd" >/dev/null || { echo "Missing: $cmd" >&2; exit 2; }
 done
 DEVICE=$(readlink -f "$DEVICE")
@@ -24,6 +23,29 @@ size_bytes=$(blockdev --getsize64 "$DEVICE")
 ((size_bytes >= 12*1024*1024*1024)) || { echo 'USB must be at least 12 GiB.' >&2; exit 2; }
 iso_bytes=$(stat -c %s "$ISO")
 ((iso_bytes < 4294967295)) || { echo 'ISO exceeds the FAT32 single-file limit.' >&2; exit 2; }
+ISO_LIST=$(mktemp)
+TMP=
+cleanup(){
+  if [[ -n $TMP ]]; then
+    umount "$TMP/boot" 2>/dev/null || true
+    umount "$TMP/data" 2>/dev/null || true
+    rmdir "$TMP/boot" "$TMP/data" "$TMP" 2>/dev/null || true
+  fi
+  rm -f "$ISO_LIST"
+}
+trap cleanup EXIT
+bsdtar -tf "$ISO" > "$ISO_LIST" 2>/dev/null || {
+  echo 'ISO cannot be read as an archive.' >&2
+  exit 2
+}
+grep -qx 'arch/boot/x86_64/vmlinuz-linux' "$ISO_LIST" || {
+  echo 'ISO layout does not match GRUB config (kernel missing).' >&2
+  exit 2
+}
+grep -qx 'arch/boot/x86_64/initramfs-linux.img' "$ISO_LIST" || {
+  echo 'ISO layout does not match GRUB config (initramfs missing).' >&2
+  exit 2
+}
 model=$(lsblk -dn -o MODEL "$DEVICE" | xargs)
 serial=$(lsblk -dn -o SERIAL "$DEVICE" | xargs)
 echo '===== DESTRUCTIVE USB INSTALL ====='
@@ -55,8 +77,6 @@ done
 mkfs.vfat -F32 -n INTAKE_BOOT "$p2"
 mkfs.ext4 -F -L INTAKE_DATA "$p3"
 TMP=$(mktemp -d)
-cleanup(){ umount "$TMP/boot" 2>/dev/null || true; umount "$TMP/data" 2>/dev/null || true; rm -rf "$TMP"; }
-trap cleanup EXIT
 mkdir -p "$TMP/boot" "$TMP/data"
 mount "$p2" "$TMP/boot"; mount "$p3" "$TMP/data"
 mkdir -p "$TMP/boot/boot/grub" "$TMP/data/reports" "$TMP/data/database" "$TMP/data/checklists" "$TMP/data/reference"
@@ -69,7 +89,6 @@ if ! cp "$ISO" "$TMP/boot/pc-intake.iso" || ! sync -f "$TMP/boot"; then
   fi
   exit 1
 fi
-# Copy video reference files separately under INTAKE_DATA/reference (optional).
 cat > "$TMP/boot/boot/grub/grub.cfg" <<'GRUBCFG'
 set timeout=5
 set default=0
@@ -83,13 +102,6 @@ menuentry 'PC Intake Live USB (offline technician mode)' {
 menuentry 'Reboot' { reboot }
 menuentry 'Power off' { halt }
 GRUBCFG
-# Ensure expected kernel layout exists *in the built ISO* before proceeding.
-if ! bsdtar -tf "$ISO" 2>/dev/null | grep -qx 'arch/boot/x86_64/vmlinuz-linux'; then
- echo 'ISO layout does not match GRUB config (kernel missing). Aborting bootloader setup.' >&2; exit 1
-fi
-if ! bsdtar -tf "$ISO" 2>/dev/null | grep -qx 'arch/boot/x86_64/initramfs-linux.img'; then
- echo 'ISO layout does not match GRUB config (initramfs missing).' >&2; exit 1
-fi
 grub-install --target=x86_64-efi --efi-directory="$TMP/boot" --boot-directory="$TMP/boot/boot" --removable --no-nvram --recheck
 grub-install --target=i386-pc --boot-directory="$TMP/boot/boot" --recheck "$DEVICE"
 sync