From 16103df8253604de9c326a772867691a4708881b Mon Sep 17 00:00:00 2001
From: Wildan M <willnode@wellosoft.net>
Date: Sun, 3 May 2026 06:26:34 +0700
Subject: [PATCH 1/2] Reorder install script for fedora apt tools

---
 native_bootstrap.sh | 6 +++---
 podman_bootstrap.sh | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/native_bootstrap.sh b/native_bootstrap.sh
index 7e136396..2378a2f3 100755
--- a/native_bootstrap.sh
+++ b/native_bootstrap.sh
@@ -1144,12 +1144,12 @@ else
     # SUSE and derivatives
     elif hash 2>/dev/null zypper; then
         suse "$emulator"
-    # Debian or any derivative of it
-    elif hash 2>/dev/null apt-get; then
-        ubuntu "$emulator" "$noninteractive" "$defpackman"
     # Fedora
     elif hash 2>/dev/null dnf; then
         fedora "$emulator" "$noninteractive"
+    # Debian or any derivative of it
+    elif hash 2>/dev/null apt-get; then
+        ubuntu "$emulator" "$noninteractive" "$defpackman"
     # Gentoo
     elif hash 2>/dev/null emerge; then
         gentoo "$emulator"
diff --git a/podman_bootstrap.sh b/podman_bootstrap.sh
index fa6d99b6..27db878b 100755
--- a/podman_bootstrap.sh
+++ b/podman_bootstrap.sh
@@ -632,12 +632,12 @@ else
     # SUSE and derivatives
     if hash 2>/dev/null zypper; then
         suse "$emulator"
-    # Debian or any derivative of it
-    elif hash 2>/dev/null apt-get; then
-        ubuntu "$emulator" "$defpackman"
     # Fedora
     elif hash 2>/dev/null dnf; then
         fedora "$emulator"
+    # Debian or any derivative of it
+    elif hash 2>/dev/null apt-get; then
+        ubuntu "$emulator" "$defpackman"
     # Gentoo
     elif hash 2>/dev/null emerge; then
         gentoo "$emulator"

From c3ccda5e992580ec656a78fb29344f05b3460613 Mon Sep 17 00:00:00 2001
From: Wildan M <willnode@wellosoft.net>
Date: Sun, 3 May 2026 06:27:34 +0700
Subject: [PATCH 2/2] Use correct riscv qemu package for ubuntu

---
 native_bootstrap.sh | 7 +++++--
 podman_bootstrap.sh | 9 ++++++---
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/native_bootstrap.sh b/native_bootstrap.sh
index 2378a2f3..b827d99b 100755
--- a/native_bootstrap.sh
+++ b/native_bootstrap.sh
@@ -456,9 +456,12 @@ ubuntu()
     if [ "$1" == "qemu" ]; then
         if [ -z "$(which qemu-system-x86_64)" ]; then
             echo "Installing QEMU..."
+            if apt-cache show qemu-system-riscv > /dev/null 2>&1
+            then riscv="qemu-system-riscv" # ubuntu 26 / debian 13
+            else riscv="qemu-system-riscv64" # ubuntu 24 / debian 12
+            fi
             sudo $install_command qemu-system-x86 qemu-kvm \
-                qemu-system-arm qemu-efi-aarch64 \
-                qemu-system-riscv
+                qemu-system-arm qemu-efi-aarch64 $riscv
         else
             echo "QEMU already installed!"
         fi
diff --git a/podman_bootstrap.sh b/podman_bootstrap.sh
index 27db878b..03132404 100755
--- a/podman_bootstrap.sh
+++ b/podman_bootstrap.sh
@@ -215,9 +215,12 @@ ubuntu()
     if [ "$1" == "qemu" ]; then
         if [ -z "$(which qemu-system-x86_64)" ]; then
             echo "Installing QEMU..."
-            sudo "$2" install qemu-system-x86 qemu-kvm
-            sudo "$2" install qemu-system-arm qemu-efi-aarch64
-            sudo "$2" install qemu-system-riscv
+            if apt-cache show qemu-system-riscv > /dev/null 2>&1
+            then riscv="qemu-system-riscv" # ubuntu 26 / debian 13
+            else riscv="qemu-system-riscv64" # ubuntu 24 / debian 12
+            fi
+            sudo $install_command qemu-system-x86 qemu-kvm \
+                qemu-system-arm qemu-efi-aarch64 $riscv
         else
             echo "QEMU already installed!"
         fi