Merge branch 'improve-qemu-podman' into 'master'

Some QEMU changes

See merge request redox-os/redox!1688
This commit is contained in:
Jeremy Soller 2025-11-20 14:43:29 -07:00
commit 97f5b9f72d
2 changed files with 10 additions and 5 deletions

View File

@ -362,7 +362,7 @@ archLinux()
gdb"
if [ "$1" == "qemu" ]; then
packages="$packages qemu"
packages="$packages qemu-system-x86 qemu-system-arm qemu-system-riscv"
elif [ "$1" == "virtualbox" ]; then
packages="$packages virtualbox"
else
@ -493,7 +493,8 @@ ubuntu()
if [ -z "$(which qemu-system-x86_64)" ]; then
echo "Installing QEMU..."
sudo $install_command qemu-system-x86 qemu-kvm
sudo $install_command qemu-efi-arm qemu-system-arm
sudo $install_command qemu-system-arm qemu-efi-aarch64
sudo $install_command qemu-system-riscv
else
echo "QEMU already installed!"
fi
@ -543,6 +544,8 @@ fedora()
if [ -z "$(which qemu-system-x86_64)" ]; then
echo "Installing QEMU..."
sudo $dnf_install qemu-system-x86 qemu-kvm
sudo $dnf_install qemu-system-arm edk2-aarch64
sudo $dnf_install qemu-system-riscv
else
echo "QEMU already installed!"
fi

View File

@ -180,7 +180,7 @@ archLinux()
echo "Detected Arch Linux"
packages="git make curl fuse3 fuse-overlayfs slirp4netns podman gdb"
if [ "$1" == "qemu" ]; then
packages="$packages qemu"
packages="$packages qemu-system-x86 qemu-system-arm qemu-system-riscv"
elif [ "$1" == "virtualbox" ]; then
packages="$packages virtualbox"
else
@ -216,7 +216,8 @@ ubuntu()
if [ -z "$(which qemu-system-x86_64)" ]; then
echo "Installing QEMU..."
sudo "$2" install qemu-system-x86 qemu-kvm
sudo "$2" install qemu-efi-arm qemu-system-arm
sudo "$2" install qemu-system-arm qemu-efi-aarch64
sudo "$2" install qemu-system-riscv
else
echo "QEMU already installed!"
fi
@ -257,7 +258,8 @@ fedora()
if [ "$1" == "qemu" ]; then
if [ -z "$(which qemu-system-x86_64)" ]; then
echo "Installing QEMU..."
sudo dnf install qemu-system-x86 qemu-kvm
sudo dnf install qemu-system-x86 qemu-system-arm \
qemu-system-riscv qemu-kvm edk2-aarch64
else
echo "QEMU already installed!"
fi