mirror of
https://gitlab.archlinux.org/tpowa/archboot.git
synced 2024-09-20 03:50:37 +02:00
revert package cleaning in container
This commit is contained in:
parent
2d423e9761
commit
a8e935a102
3 changed files with 11 additions and 13 deletions
|
@ -67,17 +67,6 @@ _clean_container() {
|
|||
fi
|
||||
}
|
||||
|
||||
_clean_packages() {
|
||||
if [[ "${_CLEANUP_CONTAINER}" == "1" ]]; then
|
||||
# remove packages from pacman db that are not included in initramfs
|
||||
_RM_PACKAGES="grub libxml2 icu gettext refind amd-ucode intel-ucode edk2-shell cdrtools \
|
||||
libisoburn libburn libisofs mkinitcpio memtest linux-api-headers jansson libwbclient \
|
||||
libbsd libmd libpcap libnftnl libnfnetlink libnetfilter_conntrack libsasl libldap"
|
||||
echo "Uninstalling ${_RM_PACKAGES}..."
|
||||
${_PACMAN} -RDD ${_RM_PACKAGES} ${_PACMAN_DEFAULTS} &>/dev/null || exit 1
|
||||
fi
|
||||
}
|
||||
|
||||
# removing mkinitcpio hooks to speed up process, removing not needed initramdisks
|
||||
_clean_mkinitcpio() {
|
||||
echo "Cleaning mkinitcpio from ${1}..."
|
||||
|
|
|
@ -2,6 +2,7 @@
|
|||
# SPDX-License-Identifier: GPL-2.0-only
|
||||
# created by Tobias Powalowski <tpowa@archlinux.org>
|
||||
# don't run ttyS0 as first device
|
||||
|
||||
_welcome () {
|
||||
[[ "$(uname -m)" == "x86_64" ]] && echo -e "\033[1mWelcome to \033[36mArchboot\033[0m\033[1m - Arch Linux\033[0m"
|
||||
[[ "$(uname -m)" == "aarch64" ]] && echo -e "\033[1mWelcome to \033[36mArchboot\033[0m\033[1m - Arch Linux ARM\033[0m"
|
||||
|
@ -81,6 +82,16 @@ if ! [[ -e "/.vconsole-run" ]]; then
|
|||
echo FONT=ter-v${SIZE}n >> /etc/vconsole.conf
|
||||
systemctl restart systemd-vconsole-setup
|
||||
fi
|
||||
if ! [[ -e "/.clean-pacman-db" ]]; then
|
||||
touch /.clean-pacman-db
|
||||
_RM_PACMAN_DB="grub libxml2 icu gettext refind amd-ucode intel-ucode edk2-shell cdrtools \
|
||||
libisoburn libburn libisofs mkinitcpio memtest linux-api-headers jansson libwbclient \
|
||||
libbsd libmd libpcap libnftnl libnfnetlink libnetfilter_conntrack libsasl libldap"
|
||||
for i in ${_RM_PACMAN_DB}; do
|
||||
rm -rf /var/lib/pacman/local/${i}* &>/dev/null
|
||||
done
|
||||
fi
|
||||
|
||||
if [[ -e /usr/bin/setup ]]; then
|
||||
_local_mode
|
||||
_enter_shell
|
||||
|
|
|
@ -19,7 +19,6 @@ if echo "${_BASENAME}" | grep -qw "${_RUNNING_ARCH}"; then
|
|||
_clean_cache "${1}"
|
||||
_install_archboot "${1}" || exit 1
|
||||
_clean_cache "${1}"
|
||||
_clean_packages "${1}" || exit 1
|
||||
_umount_special "${1}" || exit 1
|
||||
_clean_container "${1}"
|
||||
_generate_keyring "${1}" || exit 1
|
||||
|
@ -49,7 +48,6 @@ else
|
|||
_install_archboot "${1}" "use_binfmt" || exit 1
|
||||
_clean_mkinitcpio "${1}"
|
||||
_clean_container "${1}" 2>/dev/null
|
||||
_clean_packages "${1}" || exit 1
|
||||
else
|
||||
echo "Error: binfmt usage is only supported on x86_64!"
|
||||
exit 1
|
||||
|
|
Loading…
Reference in a new issue