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

add progress to initramfs collecting

Browse source
This commit is contained in:
Tobias Powalowski 2023-08-03 09:19:04 +02:00
parent a1b694b68e
commit 815332d343
1 changed files with 26 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -109,7 +109,15 @@ _clean_archboot() {
done
}
_collect_files() {
touch "${_W_DIR}"/.archboot
_KVER=$(_kver "${_RAM}/${_VMLINUZ}")
{_NSPAWN} "${_W_DIR}" /bin/bash -c "umount tmp;archboot-cpio.sh -k ${_KVER} -c ${_CONFIG} -d /tmp" >"${_LOG}" 2>&1
rm "${_W_DIR}"/.archboot
}
_create_initramfs() {
touch "${_W_DIR}"/.archboot
# https://www.kernel.org/doc/Documentation/filesystems/ramfs-rootfs-initramfs.txt
# compress image with zstd
cd "${_W_DIR}"/tmp || exit 1
@ -123,6 +131,7 @@ _create_initramfs() {
_clean_kernel_cache
sleep 1
done
rm "${_W_DIR}"/.archboot
}
_download_latest() {
@ -174,13 +183,6 @@ _download_latest() {
echo -e "\e[1mFinished:\e[m Downloading scripts done."
}
_collect_files() {
touch "${_W_DIR}"/.archboot
_KVER=$(_kver "${_RAM}/${_VMLINUZ}")
{_NSPAWN} "${_W_DIR}" /bin/bash -c "umount tmp;archboot-cpio.sh -k ${_KVER} -c ${_CONFIG} -d /tmp" >"${_LOG}" 2>&1
rm "${_W_DIR}"/.archboot
}
_new_environment() {
_kill_w_dir
_gpg_check
@ -289,7 +291,23 @@ _new_environment() {
cp /.pacsetup "${_C_DIR}"/
fi
_progress "80" "Creating initramfs ${_RAM}/${_INITRD}..."
_create_initramfs
(_create_initramfs &)
sleep 1
_COUNT=81
while [[ -e "${_W_DIR}/.archboot" ]]; do
if [[ "${_COUNT}" -lt 94 ]]; then
_progress "${_COUNT}" "Creating initramfs ${_RAM}/${_INITRD}..."
fi
if [[ "${_COUNT}" -gt 94 ]]; then
_progress "94" "Creating initramfs ${_RAM}/${_INITRD}..."
fi
# abort after 15 minutes
if [[ "${_COUNT}" -gt 150 ]]; then
exit 1
fi
_COUNT="$((_COUNT+1))"
sleep 5
done
_progress "95" "Cleanup ${_W_DIR}..."
cd /
_kill_w_dir