root/archboot
1
0
Fork 0
mirror of https://gitlab.archlinux.org/tpowa/archboot.git synced 2024-09-19 19:40:37 +02:00
Code Issues Projects Releases Packages Wiki Activity

use already local pacman chroot

Browse source
This commit is contained in:
Tobias Powalowski 2024-07-20 22:25:13 +02:00
parent 173b771d6e
commit c2a81558b6
2 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
usr/lib/archboot/run/repository.sh
View file

@ -25,11 +25,11 @@ else
if [[ "${_RUNNING_ARCH}" == "x86_64" ]]; then if [[ "${_RUNNING_ARCH}" == "x86_64" ]]; then
if echo "${_BASENAME}" | rg -qw 'aarch64'; then if echo "${_BASENAME}" | rg -qw 'aarch64'; then
_pacman_chroot "${_REPODIR}" "${_ARCHBOOT_AARCH64_CHROOT_PUBLIC}" \ _pacman_chroot "${_REPODIR}" "${_ARCHBOOT_AARCH64_CHROOT_PUBLIC}" \
"${_PACMAN_AARCH64_CHROOT}" || exit 1 "${_ISO_HOME}/${_PACMAN_AARCH64_CHROOT}" || exit 1
fi fi
if echo "${_BASENAME}" | rg -qw 'riscv64'; then if echo "${_BASENAME}" | rg -qw 'riscv64'; then
_pacman_chroot "${_REPODIR}" "${_ARCHBOOT_RISCV64_CHROOT_PUBLIC}" \ _pacman_chroot "${_REPODIR}" "${_ARCHBOOT_RISCV64_CHROOT_PUBLIC}" \
"${_PACMAN_RISCV64_CHROOT}" || exit 1 "${_ISO_HOME}/${_PACMAN_RISCV64_CHROOT}" || exit 1
fi fi
_create_pacman_conf "${_REPODIR}" "use_binfmt" _create_pacman_conf "${_REPODIR}" "use_binfmt"
_pacman_parameters "${_REPODIR}" "use_binfmt" _pacman_parameters "${_REPODIR}" "use_binfmt"

4
usr/lib/archboot/server.sh
View file

@ -20,10 +20,12 @@ _update_pacman_chroot() {
# update pacman chroot # update pacman chroot
cd "${_ISO_HOME}" || exit 1 cd "${_ISO_HOME}" || exit 1
[[ -d "${_ARCH_DIR}" ]] || mkdir "${_ARCH_DIR}" [[ -d "${_ARCH_DIR}" ]] || mkdir "${_ARCH_DIR}"
echo "Downloading pacman ${_ARCH} chroot..."
if ! [[ -f pacman-${_ARCH}-chroot-latest.tar.zst ]]; then if ! [[ -f pacman-${_ARCH}-chroot-latest.tar.zst ]]; then
echo "Downloading pacman ${_ARCH} chroot..."
${_DLPROG} -O "${_ARCH_CHROOT_PUBLIC}"/"${_PACMAN_CHROOT}" ${_DLPROG} -O "${_ARCH_CHROOT_PUBLIC}"/"${_PACMAN_CHROOT}"
${_DLPROG} -O "${_ARCH_CHROOT_PUBLIC}"/"${_PACMAN_CHROOT}".sig ${_DLPROG} -O "${_ARCH_CHROOT_PUBLIC}"/"${_PACMAN_CHROOT}".sig
else
echo "Using local pacman ${_ARCH} chroot..."
fi fi
# verify download # verify download
#shellcheck disable=SC2024 #shellcheck disable=SC2024