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

fix initramfs cleanup

Browse source
This commit is contained in:
Tobias Powalowski 2022-02-05 10:28:47 +01:00
parent e457c673df
commit 1d1edf0ce2
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
usr/bin/archboot-aarch64-create-container.sh
View file

@ -78,7 +78,7 @@ if [[ "$(uname -m)" == "aarch64" ]]; then
# install archboot
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
rm "${_DIR}"/boot/{initramfs-linux.img,initramfs-linux-fallback.img}
rm ${_DIR}/boot/{initramfs-linux.img,initramfs-linux-fallback.img}
cleancache
echo "Installing archboot to ${_DIR} ..."
pacman --root "${_DIR}" -Sy archboot-arm --ignore systemd-resolvconf --noconfirm >/dev/null 2>&1
@ -124,7 +124,7 @@ if [[ "$(uname -m)" == "x86_64" ]]; then
systemd-nspawn -D "${_DIR}" pacman -Syu --noconfirm >/dev/null 2>&1
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
rm "${_DIR}"/boot/{initramfs-linux.img,initramfs-linux-fallback.img}
rm ${_DIR}/boot/{initramfs-linux.img,initramfs-linux-fallback.img}
cleancache
saveram
[[ "${_SAVE_RAM}" == "1" ]] && rm -r "${_DIR}"/usr/share/{i18n,locale}

2
usr/bin/archboot-x86_64-create-container.sh
View file

@ -59,7 +59,7 @@ mount shm "${_DIR}/dev/shm" -t tmpfs -o mode=1777,nosuid,nodev
# install archboot
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
rm "${_DIR}"/boot/{initramfs-linux.img,initramfs-linux-fallback.img}
rm ${_DIR}/boot/{initramfs-linux.img,initramfs-linux-fallback.img}
if [[ "${_CLEANUP_CACHE}" == "1" ]]; then
# clean cache
echo "Clean pacman cache from ${_DIR} ..."