diff --git a/src/disk.sh b/src/disk.sh index bc970fb..6affe88 100644 --- a/src/disk.sh +++ b/src/disk.sh @@ -347,6 +347,31 @@ checkFS () { return 0 } +createDevice () { + + local DISK_ID=$1 + local DISK_FILE=$2 + local DISK_INDEX=$3 + local DISK_ADDRESS=$4 + + local result="-drive file=$DISK_FILE,if=none,id=drive-$DISK_ID,format=raw,cache=$DISK_CACHE,aio=$DISK_IO,discard=$DISK_DISCARD,detect-zeroes=on" + + if [[ "${BOOT_MODE,,}" == "windows_legacy" ]]; then + + result="$result -device virtio-blk-pci,scsi=off,bus=pcie.0,addr=$DISK_ADDRESS,drive=drive-$DISK_ID,id=$DISK_ID,iothread=io2,bootindex=$DISK_INDEX" + + else + + result="$result \ + -device virtio-scsi-pci,id=hw-$DISK_ID,iothread=io2,bus=pcie.0,addr=$DISK_ADDRESS \ + -device scsi-hd,bus=hw-$DISK_ID.0,channel=0,scsi-id=0,lun=0,drive=drive-$DISK_ID,id=$DISK_ID,rotation_rate=$DISK_ROTATION,bootindex=$DISK_INDEX" + + fi + + echo "$result" + return 0 +} + addDisk () { local DISK_ID=$1 local DISK_BASE=$2 @@ -357,7 +382,7 @@ addDisk () { local DISK_ADDRESS=$7 local DISK_FMT=$8 local DISK_FILE="$DISK_BASE.$DISK_EXT" - local DIR DATA_SIZE FS PREV_FMT PREV_EXT CUR_SIZE + local DIR DATA_SIZE FS PREV_FMT PREV_EXT CUR_SIZE OPTS DIR=$(dirname "$DISK_FILE") [ ! -d "$DIR" ] && return 0 @@ -401,10 +426,8 @@ addDisk () { fi - DISK_OPTS="$DISK_OPTS \ - -device virtio-scsi-pci,id=hw-$DISK_ID,iothread=io2,bus=pcie.0,addr=$DISK_ADDRESS \ - -drive file=$DISK_FILE,if=none,id=drive-$DISK_ID,format=$DISK_FMT,cache=$DISK_CACHE,aio=$DISK_IO,discard=$DISK_DISCARD,detect-zeroes=on \ - -device scsi-hd,bus=hw-$DISK_ID.0,channel=0,scsi-id=0,lun=0,drive=drive-$DISK_ID,id=$DISK_ID,rotation_rate=$DISK_ROTATION,bootindex=$DISK_INDEX" + OPTS=$(createDevice "$DISK_ID" "$DISK_FILE" "$DISK_INDEX" "$DISK_ADDRESS") + DISK_OPTS="$DISK_OPTS $OPTS" return 0 } @@ -420,11 +443,10 @@ addDevice () { [ -z "$DISK_DEV" ] && return 0 [ ! -b "$DISK_DEV" ] && error "Device $DISK_DEV cannot be found! Please add it to the 'devices' section of your compose file." && exit 55 - DISK_OPTS="$DISK_OPTS \ - -device virtio-scsi-pci,id=hw-$DISK_ID,iothread=io2,bus=pcie.0,addr=$DISK_ADDRESS \ - -drive file=$DISK_DEV,if=none,id=drive-$DISK_ID,format=raw,cache=$DISK_CACHE,aio=$DISK_IO,discard=$DISK_DISCARD,detect-zeroes=on \ - -device scsi-hd,bus=hw-$DISK_ID.0,channel=0,scsi-id=0,lun=0,drive=drive-$DISK_ID,id=$DISK_ID,rotation_rate=$DISK_ROTATION,bootindex=$DISK_INDEX" - + local OPTS + OPTS=$(createDevice "$DISK_ID" "$DISK_DEV" "$DISK_INDEX" "$DISK_ADDRESS") + DISK_OPTS="$DISK_OPTS $OPTS" + return 0 }