FIX: correct qemu arch

alealexpro100 · Jan 31, 2023 · f53961e · f53961e
1 parent ef4e2f3
commit f53961e
Show file tree

Hide file tree

Showing 7 changed files with 22 additions and 15 deletions.
diff --git a/bin/alpine-bootstrap b/bin/alpine-bootstrap
@@ -46,8 +46,9 @@ fi
 if [[ $arch == "$alpine_arch" ]]; then
   apk_static_run=""
 else
-  if qemu_chroot check "$arch" ok; then
-    apk_static_run="qemu_run_bin $arch"
+  parse_arch "$arch"
+  if qemu_chroot check "$qemu_arch" ok; then
+    apk_static_run="qemu_run_bin $qemu_arch"
   else
     exit 1
   fi

diff --git a/bin/arch-bootstrap b/bin/arch-bootstrap
@@ -35,8 +35,9 @@ parse_arch "$(uname -m)"
 if [[ $arch == "$arch_arch" ]]; then
   arch_chroot_command="chroot_rootfs auto"
 else
-  if qemu_chroot check "$arch" ok; then
-    arch_chroot_command="qemu_chroot $arch"
+  parse_arch "$arch"
+  if qemu_chroot check "$qemu_arch" ok; then
+    arch_chroot_command="qemu_chroot $qemu_arch"
   else
     return_err "Qemu emulation is not supported by your system. Aboring."
   fi

diff --git a/bin/void-bootstrap b/bin/void-bootstrap
@@ -34,9 +34,10 @@ if [[ $arch == "$void_arch" ]]; then
   arch_chroot_command="chroot_rootfs auto"
   xbps_static_run=""
 else
-  if qemu_chroot check "$arch" ok; then
-    arch_chroot_command="qemu_chroot $arch"
-    xbps_static_run="qemu_run_bin $arch"
+  parse_arch "$arch"
+  if qemu_chroot check "$qemu_arch" ok; then
+    arch_chroot_command="qemu_chroot $qemu_arch"
+    xbps_static_run="qemu_run_bin $qemu_arch"
   else
     exit 1
   fi

diff --git a/lib/distr/alpine/distr_actions.sh b/lib/distr/alpine/distr_actions.sh
@@ -3,8 +3,9 @@
 if [[ $arch == $alpine_arch ]]; then
   arch_chroot_command="chroot_rootfs auto"
 else
-  if qemu_chroot check $arch ok; then
-    arch_chroot_command="qemu_chroot $arch"
+  parse_arch "$qemu_arch"
+  if qemu_chroot check $qemu_arch ok; then
+    arch_chroot_command="qemu_chroot $qemu_arch"
   else
     exit 1
   fi

diff --git a/lib/distr/archlinux/distr_actions.sh b/lib/distr/archlinux/distr_actions.sh
@@ -3,8 +3,9 @@
 if [[ $arch == $arch_arch ]]; then
   arch_chroot_command="chroot_rootfs auto"
 else
-  if qemu_chroot check $arch ok; then
-    arch_chroot_command="qemu_chroot $arch"
+  parse_arch "$qemu_arch"
+  if qemu_chroot check $qemu_arch ok; then
+    arch_chroot_command="qemu_chroot $qemu_arch"
   else
     exit 1
   fi

diff --git a/lib/distr/debian/distr_actions.sh b/lib/distr/debian/distr_actions.sh
@@ -3,8 +3,9 @@
 if [[ $arch == $debian_arch ]]; then
   arch_chroot_command="chroot_rootfs auto"
 else
-  if qemu_chroot check $arch ok; then
-    arch_chroot_command="qemu_chroot $arch"
+  parse_arch "$qemu_arch"
+  if qemu_chroot check $qemu_arch ok; then
+    arch_chroot_command="qemu_chroot $qemu_arch"
   else
     exit 1
   fi

diff --git a/lib/distr/voidlinux/distr_actions.sh b/lib/distr/voidlinux/distr_actions.sh
@@ -3,8 +3,9 @@
 if [[ $arch == $void_arch ]]; then
   arch_chroot_command="chroot_rootfs auto"
 else
-  if qemu_chroot check $arch ok; then
-    arch_chroot_command="qemu_chroot $arch"
+  parse_arch "$qemu_arch"
+  if qemu_chroot check $qemu_arch ok; then
+    arch_chroot_command="qemu_chroot $qemu_arch"
   else
     exit 1
   fi