oSoWoSo/DistroHopper
1
0
Fork 0
mirror of https://github.com/oSoWoSo/DistroHopper.git synced 2024-08-14 22:46:53 +00:00
Code Issues Projects Releases Packages Wiki Activity

Change $driver_iso to $fixed_iso

Browse source 
Compatibility for configurations using $driver_iso is preserved.
This commit is contained in:
Martin Wimpress 2021-09-28 15:32:12 +01:00
parent ac13c5875a
commit f60e92d80e
No known key found for this signature in database
GPG key ID: 61DF940515E06DA3
2 changed files with 25 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

27
quickemu
View file

@ -275,8 +275,8 @@ function vm_boot() {
echo " - Boot: ${iso}" echo " - Boot: ${iso}"
fi fi
if [ -n "${driver_iso}" ] && [ -e "${driver_iso}" ]; then if [ -n "${fixed_iso}" ] && [ -e "${fixed_iso}" ]; then
echo " - Drivers: ${driver_iso}" echo " - CD-ROM: ${fixed_iso}"
fi fi
local CORES_VM="1" local CORES_VM="1"
@ -502,14 +502,24 @@ function vm_boot() {
args+=(-drive id=SystemDisk,if=none,format=qcow2,file="${disk_img}" args+=(-drive id=SystemDisk,if=none,format=qcow2,file="${disk_img}"
-device virtio-blk-pci,drive=SystemDisk,scsi=off ${STATUS_QUO}) -device virtio-blk-pci,drive=SystemDisk,scsi=off ${STATUS_QUO})
if [ -n "${fixed_iso}" ]; then
# shellcheck disable=SC2054
args+=(-drive media=cdrom,index=0,file="${fixed_iso}")
fi
else
if [ -n "${iso}" ]; then if [ -n "${iso}" ]; then
# shellcheck disable=SC2054 # shellcheck disable=SC2054
args+=(-drive media=cdrom,index=0,file="${iso}") args+=(-drive media=cdrom,index=0,file="${iso}")
fi fi
else
if [ -n "${fixed_iso}" ]; then
# shellcheck disable=SC2054
args+=(-drive media=cdrom,index=1,file="${fixed_iso}")
fi
# shellcheck disable=SC2054,SC2206 # shellcheck disable=SC2054,SC2206
args+=(-drive media=cdrom,index=0,file="${iso}" args+=(
-drive media=cdrom,index=1,file="${driver_iso}" -device virtio-blk-pci,drive=drive0,scsi=off
-drive id=drive0,if=none,cache=directsync,aio=native,format=qcow2,file="${disk_img}" -drive id=drive0,if=none,cache=directsync,aio=native,format=qcow2,file="${disk_img}"
-device virtio-blk-pci,drive=drive0,scsi=off ${STATUS_QUO} -device virtio-blk-pci,drive=drive0,scsi=off ${STATUS_QUO}
-device qemu-xhci,id=spicepass -device qemu-xhci,id=spicepass
@ -584,7 +594,7 @@ boot="efi"
cpu_cores="" cpu_cores=""
disk_img="" disk_img=""
disk="64G" disk="64G"
driver_iso="" fixed_iso=""
guest_os="linux" guest_os="linux"
img="" img=""
iso="" iso=""
@ -690,6 +700,11 @@ if [ -n "${VM}" ] && [ -e "${VM}" ]; then
echo "ERROR! No disk_img defined." echo "ERROR! No disk_img defined."
exit 1 exit 1
fi fi
# Backwards compatibility for ${driver_iso}
if [ -n "${driver_iso}" ] && [ -z "${fixed_iso}" ]; then
fixed_iso="${driver_iso}"
fi
else else
echo "ERROR! Virtual machine configuration not found." echo "ERROR! Virtual machine configuration not found."
usage usage

6
quickget
View file

@ -121,9 +121,11 @@ function make_vm_dir() {
function make_vm_config() { function make_vm_config() {
local IMAGE_FILE="" local IMAGE_FILE=""
local ISO_FILE=""
local IMAGE_TYPE="" local IMAGE_TYPE=""
local GUEST="" local GUEST=""
IMAGE_FILE="${1}" IMAGE_FILE="${1}"
ISO_FILE="${2}"
if [[ "${OS}" == *"ubuntu"* ]]; then if [[ "${OS}" == *"ubuntu"* ]]; then
GUEST="linux" GUEST="linux"
IMAGE_TYPE="iso" IMAGE_TYPE="iso"
@ -142,8 +144,8 @@ guest_os="${GUEST}"
disk_img="${VM_PATH}/disk.qcow2" disk_img="${VM_PATH}/disk.qcow2"
${IMAGE_TYPE}="${VM_PATH}/${IMAGE_FILE}" ${IMAGE_TYPE}="${VM_PATH}/${IMAGE_FILE}"
EOF EOF
if [ -n "${2}" ]; then if [ -n "${ISO_FILE}" ]; then
echo "driver_iso=${VM_PATH}/${2}" >> "${OS}-${RELEASE}.conf" echo "fixed_iso=\"${VM_PATH}/${ISO_FILE}\"" >> "${OS}-${RELEASE}.conf"
fi fi
fi fi
} }