Fabio/qemu-arm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Update disk.sh

Browse source
This commit is contained in:
Kroese 2024-05-26 13:25:41 +02:00 committed by GitHub
parent 43d9c4ef5d
commit f118139a02
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 9 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
src/disk.sh
View file

@ -514,25 +514,22 @@ case "${DISK_TYPE,,}" in
* ) error "Invalid DISK_TYPE, value \"$DISK_TYPE\" is unrecognized!" && exit 80 ;; * ) error "Invalid DISK_TYPE, value \"$DISK_TYPE\" is unrecognized!" && exit 80 ;;
esac 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 if [ -f "$BOOT" ] && [ -s "$BOOT" ]; then
MEDIA_TYPE="$DISK_TYPE"
if [ -z "${BOOT_MODE:-}" ] || [[ "${BOOT_MODE:-}" == *"legacy" ]]; then
if [[ "${MACHINE,,}" != "virt" ]] && [[ "${MEDIA_TYPE,,}" == "blk" ]]; then
MEDIA_TYPE="ide"
fi
fi
DISK_OPTS=$(addMedia "$BOOT" "$MEDIA_TYPE" "0" "$BOOT_INDEX" "0x5") DISK_OPTS=$(addMedia "$BOOT" "$MEDIA_TYPE" "0" "$BOOT_INDEX" "0x5")
fi fi
DRIVER_TYPE="ide"
DRIVERS="/drivers.iso" DRIVERS="/drivers.iso"
[ ! -f "$DRIVERS" ] || [ ! -s "$DRIVERS" ] && DRIVERS="$STORAGE/drivers.iso" [ ! -f "$DRIVERS" ] || [ ! -s "$DRIVERS" ] && DRIVERS="$STORAGE/drivers.iso"
if [ -f "$DRIVERS" ] && [ -s "$DRIVERS" ]; then if [ -f "$DRIVERS" ] && [ -s "$DRIVERS" ]; then
[[ "${MACHINE,,}" == "virt" ]] && DRIVER_TYPE="usb"
DRIVER_OPTS=$(addMedia "$DRIVERS" "$DRIVER_TYPE" "1" "" "0x6") DRIVER_OPTS=$(addMedia "$DRIVERS" "$DRIVER_TYPE" "1" "" "0x6")
DISK_OPTS="$DISK_OPTS $DRIVER_OPTS" DISK_OPTS="$DISK_OPTS $DRIVER_OPTS"
fi fi
@ -609,4 +606,5 @@ fi
DISK_OPTS="$DISK_OPTS -object iothread,id=io2" DISK_OPTS="$DISK_OPTS -object iothread,id=io2"
html "Initialized disks successfully..." html "Initialized disks successfully..."
return 0 return 0