mirror of
https://gitlab.archlinux.org/tpowa/archboot.git
synced 2024-09-20 03:50:37 +02:00
fix initramfs cleanup
This commit is contained in:
parent
1d1edf0ce2
commit
69ef4e62ac
2 changed files with 7 additions and 3 deletions
|
@ -78,7 +78,9 @@ if [[ "$(uname -m)" == "aarch64" ]]; then
|
||||||
# install archboot
|
# install archboot
|
||||||
echo "Installing packages base linux and ${_LINUX_FIRMWARE} to ${_DIR} ..."
|
echo "Installing packages base linux and ${_LINUX_FIRMWARE} to ${_DIR} ..."
|
||||||
pacman --root "${_DIR}" -Sy base linux "${_LINUX_FIRMWARE}" --ignore systemd-resolvconf --noconfirm --cachedir "${_PWD}"/"${_CACHEDIR}" >/dev/null 2>&1
|
pacman --root "${_DIR}" -Sy base linux "${_LINUX_FIRMWARE}" --ignore systemd-resolvconf --noconfirm --cachedir "${_PWD}"/"${_CACHEDIR}" >/dev/null 2>&1
|
||||||
rm ${_DIR}/boot/{initramfs-linux.img,initramfs-linux-fallback.img}
|
rm "${_DIR}"/usr/share/libalpm/hooks/60-mkinitcpio-remove.hook
|
||||||
|
rm "${_DIR}"/usr/share/libalpm/hooks/90-mkinitcpio-install.hook
|
||||||
|
rm "${_DIR}"/boot/{initramfs-linux.img,initramfs-linux-fallback.img}
|
||||||
cleancache
|
cleancache
|
||||||
echo "Installing archboot to ${_DIR} ..."
|
echo "Installing archboot to ${_DIR} ..."
|
||||||
pacman --root "${_DIR}" -Sy archboot-arm --ignore systemd-resolvconf --noconfirm >/dev/null 2>&1
|
pacman --root "${_DIR}" -Sy archboot-arm --ignore systemd-resolvconf --noconfirm >/dev/null 2>&1
|
||||||
|
@ -124,7 +126,7 @@ if [[ "$(uname -m)" == "x86_64" ]]; then
|
||||||
systemd-nspawn -D "${_DIR}" pacman -Syu --noconfirm >/dev/null 2>&1
|
systemd-nspawn -D "${_DIR}" pacman -Syu --noconfirm >/dev/null 2>&1
|
||||||
echo "Installing archboot-arm and ${_LINUX_FIRMWARE} to container..."
|
echo "Installing archboot-arm and ${_LINUX_FIRMWARE} to container..."
|
||||||
systemd-nspawn -D "${_DIR}" /bin/bash -c "pacman -S archboot-arm ${_LINUX_FIRMWARE} --noconfirm" >/dev/null 2>&1
|
systemd-nspawn -D "${_DIR}" /bin/bash -c "pacman -S archboot-arm ${_LINUX_FIRMWARE} --noconfirm" >/dev/null 2>&1
|
||||||
rm ${_DIR}/boot/{initramfs-linux.img,initramfs-linux-fallback.img}
|
rm "${_DIR}"/boot/{initramfs-linux.img,initramfs-linux-fallback.img}
|
||||||
cleancache
|
cleancache
|
||||||
saveram
|
saveram
|
||||||
[[ "${_SAVE_RAM}" == "1" ]] && rm -r "${_DIR}"/usr/share/{i18n,locale}
|
[[ "${_SAVE_RAM}" == "1" ]] && rm -r "${_DIR}"/usr/share/{i18n,locale}
|
||||||
|
|
|
@ -59,7 +59,9 @@ mount shm "${_DIR}/dev/shm" -t tmpfs -o mode=1777,nosuid,nodev
|
||||||
# install archboot
|
# install archboot
|
||||||
echo "Installing packages base linux and ${_LINUX_FIRMWARE} to ${_DIR} ..."
|
echo "Installing packages base linux and ${_LINUX_FIRMWARE} to ${_DIR} ..."
|
||||||
pacman --root "${_DIR}" -Sy base linux "${_LINUX_FIRMWARE}" --ignore systemd-resolvconf --noconfirm --cachedir "${_PWD}"/"${_CACHEDIR}" >/dev/null 2>&1
|
pacman --root "${_DIR}" -Sy base linux "${_LINUX_FIRMWARE}" --ignore systemd-resolvconf --noconfirm --cachedir "${_PWD}"/"${_CACHEDIR}" >/dev/null 2>&1
|
||||||
rm ${_DIR}/boot/{initramfs-linux.img,initramfs-linux-fallback.img}
|
rm "${_DIR}"/usr/share/libalpm/hooks/60-mkinitcpio-remove.hook
|
||||||
|
rm "${_DIR}"/usr/share/libalpm/hooks/90-mkinitcpio-install.hook
|
||||||
|
rm "${_DIR}"/boot/{initramfs-linux.img,initramfs-linux-fallback.img}
|
||||||
if [[ "${_CLEANUP_CACHE}" == "1" ]]; then
|
if [[ "${_CLEANUP_CACHE}" == "1" ]]; then
|
||||||
# clean cache
|
# clean cache
|
||||||
echo "Clean pacman cache from ${_DIR} ..."
|
echo "Clean pacman cache from ${_DIR} ..."
|
||||||
|
|
Loading…
Reference in a new issue