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

disable initramfs package on container installation, only download man and info pages packages

Browse source
This commit is contained in:
Tobias Powalowski 2023-10-16 13:58:49 +02:00
parent c76bf77201
commit 454bd29f5a
1 changed files with 10 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -75,12 +75,6 @@ _clean_container() {
fi
}
# removing mkinitcpio hooks to speed up process, removing not needed initramdisks
_clean_mkinitcpio() {
echo "Disable mkinitcpio from ${1}..."
ln -s "/usr/bin/true" "${1}/usr/bin/mkinitcpio"
}
_prepare_pacman() {
# prepare pacman dirs
echo "Creating directories in ${1}..."
@ -147,22 +141,21 @@ _umount_special() {
_install_base_packages() {
if [[ "${2}" == "use_binfmt" ]]; then
echo "Downloading ${_PACKAGES} ${_KEYRING} to ${1}..."
echo "Downloading ${_KEYRING} ${_PACKAGES} to ${1}..."
if grep -q 'archboot' /etc/hostname; then
#shellcheck disable=SC2086
${_PACMAN} -Syw --assume-installed mkinitcpio ${_PACKAGES} ${_KEYRING} ${_PACMAN_DEFAULTS} ${_PACMAN_DB} &>"${_LOG}" || exit 1
${_PACMAN} -Syw --assume-installed initramfs ${_KEYRING} ${_PACKAGES} ${_PACMAN_DEFAULTS} ${_PACMAN_DB} &>"${_LOG}" || exit 1
else
#shellcheck disable=SC2086
${_PACMAN} -Syw --assume-installed mkinitcpio ${_PACKAGES} ${_KEYRING} ${_PACMAN_DEFAULTS} ${_PACMAN_DB} &>"${_NO_LOG}" || exit 1
${_PACMAN} -Syw --assume-installed initramfs ${_KEYRING} ${_PACKAGES} ${_PACMAN_DEFAULTS} ${_PACMAN_DB} &>"${_NO_LOG}" || exit 1
fi
fi
echo "Installing ${_PACKAGES} ${_KEYRING} to ${1}..."
_clean_mkinitcpio "${1}"
echo "Installing ${_KEYRING} ${_PACKAGES} to ${1}..."
if grep -q 'archboot' /etc/hostname; then
${_PACMAN} -Sy --assume-installed mkinitcpio ${_PACKAGES} ${_KEYRING} ${_PACMAN_DEFAULTS} &>"${_LOG}" || exit 1
${_PACMAN} -Sy --assume-installed initramfs ${_KEYRING} ${_PACKAGES} ${_PACMAN_DEFAULTS} &>"${_LOG}" || exit 1
else
#shellcheck disable=SC2086
${_PACMAN} -Sy --assume-installed mkinitcpio ${_KEYRING} ${_PACKAGES} ${_PACMAN_DEFAULTS} &>"${_NO_LOG}" || exit 1
${_PACMAN} -Sy --assume-installed initramfs ${_KEYRING} ${_PACKAGES} ${_PACMAN_DEFAULTS} &>"${_NO_LOG}" || exit 1
fi
}
@ -172,13 +165,15 @@ _install_archboot() {
else
_pacman_key_system
fi
echo "Installing ${_ARCHBOOT} ${_MAN_INFO_PACKAGES} to ${1}..."
echo "Installing ${_ARCHBOOT}, downloading ${_MAN_INFO_PACKAGES} to ${1}..."
if grep -q 'archboot' /etc/hostname; then
#shellcheck disable=SC2086
${_PACMAN} -Sy ${_ARCHBOOT} ${_MAN_INFO_PACKAGES} ${_PACMAN_DEFAULTS} &>"${_LOG}" || exit 1
${_PACMAN} -Sy ${_ARCHBOOT} ${_PACMAN_DEFAULTS} &>"${_LOG}" || exit 1
${_PACMAN} -Syw ${_MAN_INFO_PACKAGES} ${_PACMAN_DEFAULTS} &>"${_LOG}" || exit 1
else
#shellcheck disable=SC2086
${_PACMAN} -Sy ${_ARCHBOOT} ${_MAN_INFO_PACKAGES} ${_PACMAN_DEFAULTS} &>"${_NO_LOG}" || exit 1
${_PACMAN} -Syw ${_MAN_INFO_PACKAGES} ${_PACMAN_DEFAULTS} &>"${_NO_LOG}" || exit 1
fi
# cleanup
if ! [[ "${2}" == "use_binfmt" ]]; then