From 40e583f1b4823c302ecf0568595dea3a53971aea Mon Sep 17 00:00:00 2001 From: Kroese Date: Tue, 1 Oct 2024 21:52:59 +0200 Subject: [PATCH] fix: Remove scsi parameter from virtio-blk-pci (#140) --- src/disk.sh | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/src/disk.sh b/src/disk.sh index aaf7b1f..1df83c0 100644 --- a/src/disk.sh +++ b/src/disk.sh @@ -379,7 +379,7 @@ createDevice () { ;; "blk" | "virtio-blk" ) result+=",if=none \ - -device virtio-blk-pci,drive=${DISK_ID},scsi=off,bus=pcie.0,addr=$DISK_ADDRESS,iothread=io2${index}" + -device virtio-blk-pci,drive=${DISK_ID},bus=pcie.0,addr=$DISK_ADDRESS,iothread=io2${index}" echo "$result" ;; "scsi" | "virtio-scsi" ) @@ -422,7 +422,7 @@ addMedia () { ;; "blk" | "virtio-blk" ) result+=",if=none \ - -device virtio-blk-pci,drive=${DISK_ID},scsi=off,bus=pcie.0,addr=$DISK_ADDRESS,iothread=io2${index}" + -device virtio-blk-pci,drive=${DISK_ID},bus=pcie.0,addr=$DISK_ADDRESS,iothread=io2${index}" echo "$result" ;; "scsi" | "virtio-scsi" ) @@ -578,6 +578,13 @@ if [ -f "$DRIVERS" ] && [ -s "$DRIVERS" ]; then DISK_OPTS+=$(addMedia "$DRIVERS" "$FALLBACK" "" "0x6") fi +RESCUE="/start.iso" +[ ! -f "$RESCUE" ] || [ ! -s "$RESCUE" ] && RESCUE="$STORAGE/start.iso" + +if [ -f "$RESCUE" ] && [ -s "$RESCUE" ]; then + DISK_OPTS+=$(addMedia "$RESCUE" "$FALLBACK" "1" "0x6") +fi + DISK1_FILE="$STORAGE/${DISK_NAME}" DISK2_FILE="/storage2/${DISK_NAME}2" DISK3_FILE="/storage3/${DISK_NAME}3"