Johannes/ISO
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'weltio-master-patch-55325' of https://gitlab.archlinux.org/weltio/archiso.git

Browse Source 
By weltio weltio

move $arch override to before it is used

closes https://gitlab.archlinux.org/archlinux/archiso/-/issues/163

* initial: arch=""
* _read_profile: packages="${profile}/packages.${arch}"
* _set_overrides: [[ -n "$arch" ]] || arch="$(uname -m)"

$arch is not defined in _read_profile if arch is not defined in profiledef.sh and packages is not updated after _set_overrides

[[ -n "$arch" ]] || arch="$(uname -m)" should be moved from _set_overrides to _read_profile.
This commit is contained in:
nl6720 2022-01-22 13:16:10 +02:00
commit f8225782e2
No known key found for this signature in database
GPG Key ID: 5CE88535E188D369
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
archiso/mkarchiso
View File

@ -1048,6 +1048,7 @@ _read_profile() {
. "${profile}/profiledef.sh" . "${profile}/profiledef.sh"
# Resolve paths of files that are expected to reside in the profile's directory # Resolve paths of files that are expected to reside in the profile's directory
[[ -n "$arch" ]] || arch="$(uname -m)"
[[ -n "$packages" ]] || packages="${profile}/packages.${arch}" [[ -n "$packages" ]] || packages="${profile}/packages.${arch}"
packages="$(realpath -- "${packages}")" packages="$(realpath -- "${packages}")"
pacman_conf="$(realpath -- "${pacman_conf}")" pacman_conf="$(realpath -- "${pacman_conf}")"
@ -1155,7 +1156,6 @@ _set_overrides() {
fi fi
# Set variables that do not have overrides # Set variables that do not have overrides
[[ -n "$arch" ]] || arch="$(uname -m)"
[[ -n "$airootfs_image_type" ]] || airootfs_image_type="squashfs" [[ -n "$airootfs_image_type" ]] || airootfs_image_type="squashfs"
[[ -n "$iso_name" ]] || iso_name="${app_name}" [[ -n "$iso_name" ]] || iso_name="${app_name}"
} }