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

add mkinitcpio as last package

Browse source
This commit is contained in:
Tobias Powalowski 2023-10-16 21:12:07 +02:00
parent e2c933dd3e
commit 9379d76673
2 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -155,13 +155,17 @@ _install_base_packages() {
${_PACMAN} -Syw ${_KEYRING} ${_PACKAGES} ${_MKINITCPIO} ${_PACMAN_DEFAULTS} ${_PACMAN_DB} &>"${_NO_LOG}" || exit 1 ${_PACMAN} -Syw ${_KEYRING} ${_PACKAGES} ${_MKINITCPIO} ${_PACMAN_DEFAULTS} ${_PACMAN_DB} &>"${_NO_LOG}" || exit 1
fi fi
fi fi
echo "Installing ${_KEYRING} ${_PACKAGES} to ${1}..." echo "Installing ${_KEYRING} ${_PACKAGES} ${_MKINITCPIO} to ${1}..."
: >/tmp/{60-mkinitcpio-remove.hook,90-mkinitcpio-install.hook}
if grep -q 'archboot' /etc/hostname; then if grep -q 'archboot' /etc/hostname; then
${_PACMAN} -Sy --assume-installed ${_MKINITCPIO} ${_KEYRING} ${_PACKAGES} ${_PACMAN_DEFAULTS} &>"${_LOG}" || exit 1 ${_PACMAN} -Sy --assume-installed ${_MKINITCPIO} ${_KEYRING} ${_PACKAGES} ${_PACMAN_DEFAULTS} &>"${_LOG}" || exit 1
${_PACMAN} -Sy --hookdir /tmp mkinitcpio ${_PACMAN_DEFAULTS} >"${_LOG}" 2>&1 || exit 1
else else
#shellcheck disable=SC2086 #shellcheck disable=SC2086
${_PACMAN} -Sy --assume-installed ${_MKINITCPIO} ${_KEYRING} ${_PACKAGES} ${_PACMAN_DEFAULTS} &>"${_NO_LOG}" || exit 1 ${_PACMAN} -Sy --assume-installed ${_MKINITCPIO} ${_KEYRING} ${_PACKAGES} ${_PACMAN_DEFAULTS} &>"${_NO_LOG}" || exit 1
${_PACMAN} -Sy --hookdir /tmp mkinitcpio ${_PACMAN_DEFAULTS} >"${_LOG}" 2>&1 || exit 1
fi fi
rm /tmp/{60-mkinitcpio-remove.hook,90-mkinitcpio-install.hook}
} }
_install_archboot() { _install_archboot() {

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

@ -19,7 +19,7 @@ _download_packages() {
else else
_pacman_key_system _pacman_key_system
fi fi
_PACKAGES="${_PACKAGES} ${_ARCHBOOT} ${_KEYRING} ${_MAN_INFO_PACKAGES}" _PACKAGES="${_KEYRING} ${_ARCHBOOT} ${_PACKAGES} ${_MAN_INFO_PACKAGES}"
echo "Downloading ${_PACKAGES} to ${1}..." echo "Downloading ${_PACKAGES} to ${1}..."
#shellcheck disable=SC2086 #shellcheck disable=SC2086
${_PACMAN} -Syw ${_PACKAGES} ${_PACMAN_DEFAULTS} ${_PACMAN_DB} &>"${_NO_LOG}" || exit 1 ${_PACMAN} -Syw ${_PACKAGES} ${_PACMAN_DEFAULTS} ${_PACMAN_DB} &>"${_NO_LOG}" || exit 1