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

fix order

Browse source
This commit is contained in:
Tobias Powalowski 2022-10-01 20:17:18 +02:00
parent 91e09b6a3d
commit fcfe2f783b
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
usr/lib/archboot/container.sh
View file

@ -153,12 +153,12 @@ _pacman_parameters() {
_PACMAN_CACHEDIR="--cachedir ${_CACHEDIR}"
fi
# defaults used on every pacman call
_PACMAN_DEFAULTS="--config ${_PACMAN_CONF} --ignore systemd-resolvconf --noconfirm ${_CACHEDIR}"
_PACMAN_DEFAULTS="--config ${_PACMAN_CONF} ${_PACMAN_CACHEDIR} --ignore systemd-resolvconf --noconfirm"
}
_install_base_packages() {
_PACMAN_OPTIONS="${_PACKAGES} ${_PACMAN_DEFAULTS}"
_pacman_parameters "${1}" "${2}"
_PACMAN_OPTIONS="${_PACKAGES} ${_PACMAN_DEFAULTS}"
if [[ "${2}" == "use_binfmt" ]]; then
[[ -d "${1}"/blankdb ]] || mkdir "${1}"/blankdb
echo "Downloading ${_PACKAGES} to ${1} ..."
@ -169,8 +169,8 @@ _install_base_packages() {
}
_install_archboot() {
_PACMAN_OPTIONS="${_ARCHBOOT} ${_PACMAN_DEFAULTS}"
_pacman_parameters "${1}" "${2}"
_PACMAN_OPTIONS="${_ARCHBOOT} ${_PACMAN_DEFAULTS}"
if [[ "${2}" == "use_binfmt" ]]; then
_PACMAN_DB=""
# riscv64 need does not support local image at the moment