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

remove auto exit in progress_wait

Browse source
This commit is contained in:
Tobias Powalowski 2023-09-02 16:54:49 +02:00
parent cb4e499f7b
commit 9e54061062
2 changed files with 2 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
usr/lib/archboot/common.sh
View file

@ -100,10 +100,6 @@ _progress_wait() {
if [[ "${_COUNT}" -gt "${2}" ]]; then
_progress "${2}" "${3}"
fi
# abort after 15 minutes
if [[ "${_COUNT}" -gt 150 ]]; then
exit 1
fi
_COUNT="$((_COUNT+1))"
sleep "${4}"
done

4
usr/lib/archboot/update/manage.sh
View file

@ -198,13 +198,13 @@ _new_environment() {
[[ -d "${_W_DIR}" ]] || mkdir -p "${_W_DIR}"
: > "${_W_DIR}"/.archboot
_create_container &
_progress_wait "2" "49" "Generating container in ${_W_DIR}..." "3"
_progress_wait "2" "60" "Generating container in ${_W_DIR}..." "5"
_clean_kernel_cache
_ram_check
# write initramfs to "${_ROOTFS_DIR}
: > "${_W_DIR}"/.archboot
_collect_files &
_progress_wait "50" "83" "Collecting rootfs files in ${_W_DIR}..." "1"
_progress_wait "61" "83" "Collecting rootfs files in ${_W_DIR}..." "5"
_progress "84" "Moving kernel ${_VMLINUZ} to ${_RAM}/${_VMLINUZ}..."
# use ramfs to get immediate free space on file deletion
mkdir "${_RAM}"