sync with archiso v61v61

archiso:
a814f14 (HEAD -> master, tag: v61, origin/master, origin/HEAD) Add changelog for 61
5b95058 Limit CI pipelines on default branch and merge requests
549ce5b Set all build steps to be interruptable
21ca345 Limit triggering a CI build to change of non-code files
cd14387 Add contributing guideline about merge requests
8d2d779 Add info about adding a changelog entry for merge requests
6c1b466 Add the installation of latest archlinux-keyring to CI
720516e configs/releng/airootfs/etc/systemd/system/getty@tty1.service.d/autologin.conf: update ExecStart
18bb8c2 configs/*/airootfs/etc/systemd/network/20-ethernet.network: add a comment to document why an interface name glob is used
7cbd25d Merge remote-tracking branch 'origin/merge-requests/228'
8b1788e Add linux-firmware-marvell for Surface Pro 6 wi-fi
f822578 Merge branch 'weltio-master-patch-55325' of https://gitlab.archlinux.org/weltio/archiso.git
7426192 https://gitlab.archlinux.org/archlinux/archiso/-/issues/163

Signed-off-by: David P <megver83@parabola.nu>

1 files changed, 1 insertions, 1 deletions

diff --git a/parabolaiso/mkparabolaiso b/parabolaiso/mkparabolaiso
index 08349e3..5af1851 100755
--- a/parabolaiso/mkparabolaiso
+++ b/parabolaiso/mkparabolaiso
@@ -1287,6 +1287,7 @@ _read_profile() {
         # shellcheck source=configs/releng/profiledef.sh
         . "${profile}/profiledef.sh"
 
+        [[ -n "$arch" ]] || arch="$(uname -m)"
         if [[ "${arch}" == "dual" ]]; then
             # Resolve paths of files that are expected to reside in the profile's directory for each architecture
             [[ -n "$packages_dual" ]] || packages_files_dual=("${profile}/packages."{both,i686,x86_64})
@@ -1408,7 +1409,6 @@ _set_overrides() {
     fi
 
     # Set variables that do not have overrides
-    [[ -n "$arch" ]] || arch="$(uname -m)"
     [[ -n "$airootfs_image_type" ]] || airootfs_image_type="squashfs"
     [[ -n "$iso_name" ]] || iso_name="${app_name}"
 }