mirror of
https://gitlab.archlinux.org/tpowa/archboot.git
synced 2024-09-20 12:00:37 +02:00
remove auto exit in progress_wait
This commit is contained in:
parent
cb4e499f7b
commit
9e54061062
2 changed files with 2 additions and 6 deletions
|
@ -100,10 +100,6 @@ _progress_wait() {
|
||||||
if [[ "${_COUNT}" -gt "${2}" ]]; then
|
if [[ "${_COUNT}" -gt "${2}" ]]; then
|
||||||
_progress "${2}" "${3}"
|
_progress "${2}" "${3}"
|
||||||
fi
|
fi
|
||||||
# abort after 15 minutes
|
|
||||||
if [[ "${_COUNT}" -gt 150 ]]; then
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
_COUNT="$((_COUNT+1))"
|
_COUNT="$((_COUNT+1))"
|
||||||
sleep "${4}"
|
sleep "${4}"
|
||||||
done
|
done
|
||||||
|
|
|
@ -198,13 +198,13 @@ _new_environment() {
|
||||||
[[ -d "${_W_DIR}" ]] || mkdir -p "${_W_DIR}"
|
[[ -d "${_W_DIR}" ]] || mkdir -p "${_W_DIR}"
|
||||||
: > "${_W_DIR}"/.archboot
|
: > "${_W_DIR}"/.archboot
|
||||||
_create_container &
|
_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
|
_clean_kernel_cache
|
||||||
_ram_check
|
_ram_check
|
||||||
# write initramfs to "${_ROOTFS_DIR}
|
# write initramfs to "${_ROOTFS_DIR}
|
||||||
: > "${_W_DIR}"/.archboot
|
: > "${_W_DIR}"/.archboot
|
||||||
_collect_files &
|
_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}..."
|
_progress "84" "Moving kernel ${_VMLINUZ} to ${_RAM}/${_VMLINUZ}..."
|
||||||
# use ramfs to get immediate free space on file deletion
|
# use ramfs to get immediate free space on file deletion
|
||||||
mkdir "${_RAM}"
|
mkdir "${_RAM}"
|
||||||
|
|
Loading…
Reference in a new issue