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

add gpg key to environment

Browse source
This commit is contained in:
Tobias Powalowski 2022-05-30 21:50:44 +02:00
parent e75da93227
commit 205c4d8093
3 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -143,7 +143,7 @@ _install_base_packages() {
_install_archboot() {
echo "Downloading ${_XORG} to ${1} ..."
[[ -d "${1}"/blankdb ]] || mkdir "${1}"/blankdb
pacman-key --add "${_GPG_KEY}"
pacman-key --add "${_GPG_KEY}" >/dev/null 2>&1
#shellcheck disable=SC2086
pacman --root "${1}" -Syw --dbpath "${1}"/blankdb ${_XORG} --config "${_PACMAN_CONF}" --ignore systemd-resolvconf --cachedir "${_CACHEDIR}" --noconfirm >/dev/null 2>&1
echo "Installing ${_ARCHBOOT} to ${1} ..."
@ -168,7 +168,9 @@ _aarch64_install_archboot() {
if [[ -e "${1}/$(basename "${_PACMAN_CONF}")" ]]; then
_PACMAN_CONF=$(basename "${_PACMAN_CONF}")
fi
systemd-nspawn -q -D "${1}" pacman-key --add "${_GPG_KEY}"
[[ -d "${1}"//usr/share/archboot/gpg ]] || mkdir "${1}"//usr/share/archboot/gpg
cp "${_GPG_KEY}" "${1}"/"${_GPG_KEY}"
systemd-nspawn -q -D "${1}" pacman-key --add "${_GPG_KEY}" >/dev/null 2>&1
echo "Downloading ${_ARCHBOOT} ${_XORG} to ${1} ..."
[[ -d "${1}"/blankdb ]] || mkdir "${1}"/blankdb
systemd-nspawn -q -D "${1}" /bin/bash -c "pacman -Syw --dbpath /blankdb ${_ARCHBOOT} ${_XORG} --config ${_PACMAN_CONF} --ignore systemd-resolvconf --noconfirm" >/dev/null 2>&1

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

@ -20,14 +20,16 @@ _cachedir_check() {
_download_packages() {
echo "Downloading packages ${_PACKAGES} ${_ARCHBOOT} ${_XORG} to ${1} ..."
pacman-key --add "${_GPG_KEY}"
pacman-key --add "${_GPG_KEY}" >/dev/null 2>&1
#shellcheck disable=SC2086
pacman --root "${1}" -Syw ${_PACKAGES} ${_ARCHBOOT} ${_XORG} --ignore systemd-resolvconf --noconfirm --cachedir "${_CACHEDIR}" >/dev/null 2>&1
}
_aarch64_download_packages() {
mkdir "${1}"/blankdb
systemd-nspawn -q -D "${1}" pacman-key --add "${_GPG_KEY}"
[[ -d "${1}"//usr/share/archboot/gpg ]] || mkdir "${1}"//usr/share/archboot/gpg
cp "${_GPG_KEY}" "${1}"/"${_GPG_KEY}"
systemd-nspawn -q -D "${1}" pacman-key --add "${_GPG_KEY}" >/dev/null 2>&1
echo "Downloading packages ${_PACKAGES} ${_ARCHBOOT} ${_XORG} to ${1} ..."
systemd-nspawn -q -D "${1}" /bin/bash -c "pacman -Syw ${_PACKAGES} ${_ARCHBOOT} ${_XORG} --dbpath /blankdb --ignore systemd-resolvconf --noconfirm" >/dev/null 2>&1
}

1
usr/lib/initcpio/install/archboot_installer_common
View file

@ -9,6 +9,7 @@ build ()
"/usr/lib/archboot/kde.sh" "/usr/lib/archboot/kde-wayland.sh" "/usr/lib/archboot/gnome.sh" \
"/usr/lib/archboot/gnome-wayland.sh" "/usr/lib/archboot/login.sh"
add_file "/usr/bin/archboot-update-installer.sh" "/usr/bin/update-installer.sh"
add_file "/usr/share/archboot/gpg/tpowa.gpg"
add_symlink "/etc/profile.d/zz-archboot-login.sh" "/usr/lib/archboot/login.sh"
}