diff --git a/src/boot.sh b/src/boot.sh index c3598ad..0531414 100644 --- a/src/boot.sh +++ b/src/boot.sh @@ -6,7 +6,6 @@ set -Eeuo pipefail BOOT_OPTS="" BOOT_DESC="" -DRIVER_TYPE="usb" SECURE=",secure=off" DIR="/usr/share/qemu" diff --git a/src/disk.sh b/src/disk.sh index 9fd45f8..341eb6e 100644 --- a/src/disk.sh +++ b/src/disk.sh @@ -514,8 +514,17 @@ 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") fi diff --git a/src/network.sh b/src/network.sh index 43eb542..170ee13 100644 --- a/src/network.sh +++ b/src/network.sh @@ -329,7 +329,7 @@ if [[ "$DHCP" == [Yy1]* ]]; then ! checkOS && [[ "$DEBUG" != [Yy1]* ]] && exit 19 if [[ "$IP" == "172."* ]]; then - warn "your IP starts with 172.* which is often a sign that you are not on a macvlan network (required for DHCP)!" + warn "container IP starts with 172.* which is often a sign that you are not on a macvlan network (required for DHCP)!" fi # Configuration for DHCP IP