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

replace DOWNLOAD_PACKAGES with X_PACKAGES

Browse source
This commit is contained in:
Tobias Powalowski 2022-05-11 14:38:50 +02:00
parent caa6a31042
commit 2583889efb
2 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -132,9 +132,9 @@ _install_base_packages() {
}
_install_archboot() {
echo "Downloading ${_DOWNLOAD_PACKAGES} to ${1} ..."
echo "Downloading ${_X_PACKAGES} to ${1} ..."
[[ -d "${1}"/blankdb ]] || mkdir "${1}"/blankdb
pacman --root "${1}" -Syw --dbpath "${1}"/blankdb ${_DOWNLOAD_PACKAGES} --config "${_PACMAN_CONF}" --ignore systemd-resolvconf --cachedir "${_CACHEDIR}" --noconfirm >/dev/null 2>&1
pacman --root "${1}" -Syw --dbpath "${1}"/blankdb ${_X_PACKAGES} --config "${_PACMAN_CONF}" --ignore systemd-resolvconf --cachedir "${_CACHEDIR}" --noconfirm >/dev/null 2>&1
echo "Installing ${_ARCHBOOT} to ${1} ..."
pacman --root "${1}" -Sy ${_ARCHBOOT} --config "${_PACMAN_CONF}" --ignore systemd-resolvconf --noconfirm --cachedir "${_CACHEDIR}" >/dev/null 2>&1
rm -r "${1}"/blankdb
@ -156,9 +156,9 @@ _aarch64_install_archboot() {
if [[ -e "${1}/$(basename "${_PACMAN_CONF}")" ]]; then
_PACMAN_CONF=$(basename "${_PACMAN_CONF}")
fi
echo "Downloading ${_ARCHBOOT} ${_DOWNLOAD_PACKAGES} to ${1} ..."
echo "Downloading ${_ARCHBOOT} ${_X_PACKAGES} to ${1} ..."
[[ -d "${1}"/blankdb ]] || mkdir "${1}"/blankdb
systemd-nspawn -q -D "${1}" /bin/bash -c "pacman -Syw --dbpath /blankdb ${_ARCHBOOT} ${_DOWNLOAD_PACKAGES} --config ${_PACMAN_CONF} --ignore systemd-resolvconf --noconfirm" >/dev/null 2>&1
systemd-nspawn -q -D "${1}" /bin/bash -c "pacman -Syw --dbpath /blankdb ${_ARCHBOOT} ${_X_PACKAGES} --config ${_PACMAN_CONF} --ignore systemd-resolvconf --noconfirm" >/dev/null 2>&1
echo "Installing ${_ARCHBOOT} to ${1} ..."
systemd-nspawn -q -D "${1}" /bin/bash -c "pacman -Sy ${_ARCHBOOT} --config ${_PACMAN_CONF} --ignore systemd-resolvconf --noconfirm" >/dev/null 2>&1
}

8
usr/lib/archboot/repository.sh
View file

@ -18,15 +18,15 @@ _cachedir_check() {
}
_download_packages() {
echo "Downloading packages ${_PACKAGES} ${_ARCHBOOT} ${_DOWNLOAD_PACKAGES} to ${1} ..."
echo "Downloading packages ${_PACKAGES} ${_ARCHBOOT} ${_X_PACKAGES} to ${1} ..."
#shellcheck disable=SC2086
pacman --root "${1}" -Syw ${_PACKAGES} ${_ARCHBOOT} ${_DOWNLOAD_PACKAGES} --ignore systemd-resolvconf --noconfirm --cachedir "${_CACHEDIR}" >/dev/null 2>&1
pacman --root "${1}" -Syw ${_PACKAGES} ${_ARCHBOOT} ${_X_PACKAGES} --ignore systemd-resolvconf --noconfirm --cachedir "${_CACHEDIR}" >/dev/null 2>&1
}
_aarch64_download_packages() {
mkdir "${1}"/blankdb
echo "Downloading packages ${_PACKAGES} ${_ARCHBOOT} ${_DOWNLOAD_PACKAGES} to ${1} ..."
systemd-nspawn -q -D "${1}" /bin/bash -c "pacman -Syw ${_PACKAGES} ${_ARCHBOOT} ${_DOWNLOAD_PACKAGES} --dbpath /blankdb --ignore systemd-resolvconf --noconfirm" >/dev/null 2>&1
echo "Downloading packages ${_PACKAGES} ${_ARCHBOOT} ${_X_PACKAGES} to ${1} ..."
systemd-nspawn -q -D "${1}" /bin/bash -c "pacman -Syw ${_PACKAGES} ${_ARCHBOOT} ${_X_PACKAGES} --dbpath /blankdb --ignore systemd-resolvconf --noconfirm" >/dev/null 2>&1
}
_move_packages() {