Unverified Commit 1609d1f1 authored by Kroese's avatar Kroese Committed by GitHub
Browse files

feat: Same devices for legacy machines (#534)

parent 11caa5d8

src/disk.sh

+3 −12
Original line number Diff line number Diff line
@@ -514,25 +514,16 @@ case "${DISK_TYPE,,}" in 
  * ) error "Invalid DISK_TYPE, value \"$DISK_TYPE\" is unrecognized!" && exit 80 ;;

esac



DRIVER_TYPE="ide"

MEDIA_TYPE="$DISK_TYPE"



case "${MACHINE,,}" in

  "virt" )

    DRIVER_TYPE="usb" ;;

  "pc-q35-2"* )

    DISK_TYPE="blk"

    MEDIA_TYPE="ide" ;;

esac



if [ -f "$BOOT" ] && [ -s "$BOOT" ]; then

  DISK_OPTS=$(addMedia "$BOOT" "$MEDIA_TYPE" "0" "$BOOT_INDEX" "0x5")

  DISK_OPTS=$(addMedia "$BOOT" "$DISK_TYPE" "0" "$BOOT_INDEX" "0x5")

fi



DRIVER_TYPE="ide"

DRIVERS="/drivers.iso"

[ ! -f "$DRIVERS" ] || [ ! -s "$DRIVERS" ] && DRIVERS="$STORAGE/drivers.iso"



if [ -f "$DRIVERS" ] && [ -s "$DRIVERS" ]; then

  [[ "${MACHINE,,}" ==  "virt" ]] && DRIVER_TYPE="usb"

  DRIVER_OPTS=$(addMedia "$DRIVERS" "$DRIVER_TYPE" "1" "" "0x6")

  DISK_OPTS="$DISK_OPTS $DRIVER_OPTS"

fi

src/proc.sh

+0 −2
Original line number Diff line number Diff line
@@ -9,8 +9,6 @@ set -Eeuo pipefail 
: "${CPU_MODEL:=""}"

: "${DEF_MODEL:="qemu64"}"



[[ "${MACHINE,,}" == "pc-q35-2"* ]] && HV="N"



if [[ "${ARCH,,}" != "amd64" ]]; then

  KVM="N"

  warn "your CPU architecture is ${ARCH^^} and cannot provide KVM acceleration for x64 instructions, this will cause a major loss of performance."