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

new image needs more RAM

Browse source
This commit is contained in:
Tobias Powalowski 2023-08-03 12:50:43 +02:00
parent dd2cce017f
commit 9efd839a64
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/lib/archboot/update/manage.sh
View file

@ -367,13 +367,13 @@ _new_image() {
${_NSPAWN} "${_W_DIR}" pacman -Rdd lvm2 --noconfirm &>"${_NO_LOG}" ${_NSPAWN} "${_W_DIR}" pacman -Rdd lvm2 --noconfirm &>"${_NO_LOG}"
# generate local iso in container, umount tmp it's a tmpfs and weird things could happen then # generate local iso in container, umount tmp it's a tmpfs and weird things could happen then
touch "${_W_DIR}"/.archboot touch "${_W_DIR}"/.archboot
(${_NSPAWN} "${_W_DIR}" /bin/bash -c "umount /tmp;rm -rf /tmp/*; archboot-${_RUNNING_ARCH}-iso.sh -g -p=${_PRESET_LOCAL} \ (${_NSPAWN} "${_W_DIR}" /bin/bash -c "umount /tmp;rm -rf /tmp/*; archboot-${_RUNNING_ARCH}-iso.sh -g -s -p=${_PRESET_LOCAL} \
-i=${_ISONAME}-local-${_RUNNING_ARCH}" > "${_LOG}"; rm -rf "${_W_DIR}"/var/cache/pacman/pkg/*; rm "${_W_DIR}"/.archboot) & -i=${_ISONAME}-local-${_RUNNING_ARCH}" > "${_LOG}"; rm -rf "${_W_DIR}"/var/cache/pacman/pkg/*; rm "${_W_DIR}"/.archboot) &
_ram_check _ram_check
_progress_wait "23" "55" "Generating local ISO..." "10" _progress_wait "23" "55" "Generating local ISO..." "10"
# generate latest iso in container # generate latest iso in container
touch "${_W_DIR}"/.archboot touch "${_W_DIR}"/.archboot
(${_NSPAWN} "${_W_DIR}" /bin/bash -c "umount /tmp;rm -rf /tmp/*;archboot-${_RUNNING_ARCH}-iso.sh -g -p=${_PRESET_LATEST} \ (${_NSPAWN} "${_W_DIR}" /bin/bash -c "umount /tmp;rm -rf /tmp/*;archboot-${_RUNNING_ARCH}-iso.sh -g -s -p=${_PRESET_LATEST} \
-i=${_ISONAME}-latest-${_RUNNING_ARCH}" > "${_LOG}"; rm "${_W_DIR}"/.archboot) & -i=${_ISONAME}-latest-${_RUNNING_ARCH}" > "${_LOG}"; rm "${_W_DIR}"/.archboot) &
_progress_wait "56" "69" "Generating latest ISO..." "10" _progress_wait "56" "69" "Generating latest ISO..." "10"
_progress "70" "Installing lvm2 to container..." _progress "70" "Installing lvm2 to container..."

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

@ -74,7 +74,7 @@ usage () {
echo -e " package cache (using kexec)." echo -e " package cache (using kexec)."
fi fi
fi fi
if [[ "$(grep -w MemTotal /proc/meminfo | cut -d ':' -f2 | sed -e 's# ##g' -e 's#kB$##g')" -gt 3216000 ]]; then if [[ "$(grep -w MemTotal /proc/meminfo | cut -d ':' -f2 | sed -e 's# ##g' -e 's#kB$##g')" -gt 4216000 ]]; then
echo -e " \e[1m-latest-image\e[m Generate latest image files in /archboot directory." echo -e " \e[1m-latest-image\e[m Generate latest image files in /archboot directory."
fi fi
fi fi