From 9e540610625492e18fb8d0469df960dae33cbc7a Mon Sep 17 00:00:00 2001 From: Tobias Powalowski Date: Sat, 2 Sep 2023 16:54:49 +0200 Subject: [PATCH] remove auto exit in progress_wait --- usr/lib/archboot/common.sh | 4 ---- usr/lib/archboot/update/manage.sh | 4 ++-- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/usr/lib/archboot/common.sh b/usr/lib/archboot/common.sh index 87bf32e98..54e1b22f2 100644 --- a/usr/lib/archboot/common.sh +++ b/usr/lib/archboot/common.sh @@ -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 diff --git a/usr/lib/archboot/update/manage.sh b/usr/lib/archboot/update/manage.sh index 274c105f7..4318b7012 100644 --- a/usr/lib/archboot/update/manage.sh +++ b/usr/lib/archboot/update/manage.sh @@ -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}"