mirror of
https://gitlab.archlinux.org/tpowa/archboot.git
synced 2024-09-20 03:50:37 +02:00
add progress to initramfs collecting
This commit is contained in:
parent
a1b694b68e
commit
815332d343
1 changed files with 26 additions and 8 deletions
|
@ -109,7 +109,15 @@ _clean_archboot() {
|
||||||
done
|
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() {
|
_create_initramfs() {
|
||||||
|
touch "${_W_DIR}"/.archboot
|
||||||
# https://www.kernel.org/doc/Documentation/filesystems/ramfs-rootfs-initramfs.txt
|
# https://www.kernel.org/doc/Documentation/filesystems/ramfs-rootfs-initramfs.txt
|
||||||
# compress image with zstd
|
# compress image with zstd
|
||||||
cd "${_W_DIR}"/tmp || exit 1
|
cd "${_W_DIR}"/tmp || exit 1
|
||||||
|
@ -123,6 +131,7 @@ _create_initramfs() {
|
||||||
_clean_kernel_cache
|
_clean_kernel_cache
|
||||||
sleep 1
|
sleep 1
|
||||||
done
|
done
|
||||||
|
rm "${_W_DIR}"/.archboot
|
||||||
}
|
}
|
||||||
|
|
||||||
_download_latest() {
|
_download_latest() {
|
||||||
|
@ -174,13 +183,6 @@ _download_latest() {
|
||||||
echo -e "\e[1mFinished:\e[m Downloading scripts done."
|
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() {
|
_new_environment() {
|
||||||
_kill_w_dir
|
_kill_w_dir
|
||||||
_gpg_check
|
_gpg_check
|
||||||
|
@ -289,7 +291,23 @@ _new_environment() {
|
||||||
cp /.pacsetup "${_C_DIR}"/
|
cp /.pacsetup "${_C_DIR}"/
|
||||||
fi
|
fi
|
||||||
_progress "80" "Creating initramfs ${_RAM}/${_INITRD}..."
|
_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}..."
|
_progress "95" "Cleanup ${_W_DIR}..."
|
||||||
cd /
|
cd /
|
||||||
_kill_w_dir
|
_kill_w_dir
|
||||||
|
|
Loading…
Reference in a new issue