Merge branch 'mirrorlist-32' into 'master'

Use correct mirrorlist for 32-bit version

Closes #188

See merge request systemrescue/systemrescue-sources!104
This commit is contained in:
Francois Dupoux 2021-04-24 07:59:53 +00:00
commit eb609ca35a

View file

@ -28,11 +28,13 @@ case ${arch} in
efiarch="x86_64-efi"
efiboot="bootx64.efi"
edk2arch="x64"
mirrorlist_url='https://archlinux.org/mirrorlist/?country=all&protocol=http&use_mirror_status=on'
;;
i686)
efiarch="i386-efi"
efiboot="bootia32.efi"
edk2arch="ia32"
mirrorlist_url='https://archlinux32.org/mirrorlist/?country=all&protocol=http&use_mirror_status=on'
;;
*)
echo "ERROR: Unsupported architecture: '${arch}'"
@ -105,7 +107,7 @@ make_customize_airootfs() {
s|%INSTALL_DIR%|${install_dir}|g" \
${script_path}/airootfs/etc/issue > ${work_dir}/${arch}/airootfs/etc/issue
curl -o ${work_dir}/${arch}/airootfs/etc/pacman.d/mirrorlist 'https://archlinux.org/mirrorlist/?country=all&protocol=http&use_mirror_status=on'
curl -o ${work_dir}/${arch}/airootfs/etc/pacman.d/mirrorlist "$mirrorlist_url"
setarch ${arch} mkarchiso ${verbose} -w "${work_dir}/${arch}" -C "${work_dir}/pacman.conf" -D "${install_dir}" -r '/root/customize_airootfs.sh' run
rm -f ${work_dir}/${arch}/airootfs/root/customize_airootfs.sh