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

fix: Make bootindex configurable (#370)

Browse source
This commit is contained in:
Kroese 2024-01-22 02:47:50 +01:00 committed by GitHub
parent 7f0cc38800
commit 25aa568167
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 11 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/disk.sh
View file

@ -17,7 +17,7 @@ if [ -f "$BOOT" ]; then
DISK_OPTS="$DISK_OPTS \ DISK_OPTS="$DISK_OPTS \
-device virtio-scsi-pci,id=scsi0,iothread=io2,addr=0x5 \ -device virtio-scsi-pci,id=scsi0,iothread=io2,addr=0x5 \
-drive id=cdrom0,if=none,format=raw,readonly=on,file=$BOOT \ -drive id=cdrom0,if=none,format=raw,readonly=on,file=$BOOT \
-device scsi-cd,bus=scsi0.0,drive=cdrom0,bootindex=10" -device scsi-cd,bus=scsi0.0,drive=cdrom0,bootindex=$BOOT_INDEX"
fi fi
DRIVERS="$STORAGE/drivers.img" DRIVERS="$STORAGE/drivers.img"
@ -465,27 +465,27 @@ fi
: "${DEVICE4:=""}" : "${DEVICE4:=""}"
if [ -n "$DEVICE" ]; then if [ -n "$DEVICE" ]; then
addDevice "userdata" "$DEVICE" "device" "1" "0xa" || exit $? addDevice "userdata" "$DEVICE" "device" "3" "0xa" || exit $?
else else
addDisk "userdata" "$DISK1_FILE" "$DISK_EXT" "disk" "$DISK_SIZE" "1" "0xa" "$DISK_FMT" || exit $? addDisk "userdata" "$DISK1_FILE" "$DISK_EXT" "disk" "$DISK_SIZE" "3" "0xa" "$DISK_FMT" || exit $?
fi fi
if [ -n "$DEVICE2" ]; then if [ -n "$DEVICE2" ]; then
addDevice "userdata2" "$DEVICE2" "device2" "2" "0xb" || exit $? addDevice "userdata2" "$DEVICE2" "device2" "4" "0xb" || exit $?
else else
addDisk "userdata2" "$DISK2_FILE" "$DISK_EXT" "disk2" "$DISK2_SIZE" "2" "0xb" "$DISK_FMT" || exit $? addDisk "userdata2" "$DISK2_FILE" "$DISK_EXT" "disk2" "$DISK2_SIZE" "4" "0xb" "$DISK_FMT" || exit $?
fi fi
if [ -n "$DEVICE3" ]; then if [ -n "$DEVICE3" ]; then
addDevice "userdata3" "$DEVICE3" "device3" "3" "0xc" || exit $? addDevice "userdata3" "$DEVICE3" "device3" "5" "0xc" || exit $?
else else
addDisk "userdata3" "$DISK3_FILE" "$DISK_EXT" "disk3" "$DISK3_SIZE" "3" "0xc" "$DISK_FMT" || exit $? addDisk "userdata3" "$DISK3_FILE" "$DISK_EXT" "disk3" "$DISK3_SIZE" "5" "0xc" "$DISK_FMT" || exit $?
fi fi
if [ -n "$DEVICE4" ]; then if [ -n "$DEVICE4" ]; then
addDevice "userdata4" "$DEVICE4" "device4" "4" "0xd" || exit $? addDevice "userdata4" "$DEVICE4" "device4" "6" "0xd" || exit $?
else else
addDisk "userdata4" "$DISK4_FILE" "$DISK_EXT" "disk4" "$DISK4_SIZE" "4" "0xd" "$DISK_FMT" || exit $? addDisk "userdata4" "$DISK4_FILE" "$DISK_EXT" "disk4" "$DISK4_SIZE" "6" "0xd" "$DISK_FMT" || exit $?
fi fi
html "Initialized disks successfully..." html "Initialized disks successfully..."

3
src/reset.sh
View file

@ -23,7 +23,8 @@ echo
: "${CPU_CORES:="1"}" # Amount of CPU cores : "${CPU_CORES:="1"}" # Amount of CPU cores
: "${RAM_SIZE:="1G"}" # Maximum RAM amount : "${RAM_SIZE:="1G"}" # Maximum RAM amount
: "${DISK_SIZE:="16G"}" # Initial data disk size : "${DISK_SIZE:="16G"}" # Initial data disk size
: "${BOOT_INDEX:="10"}" # Boot index of CD drive
# Helper variables # Helper variables
STORAGE="/storage" STORAGE="/storage"