root/archboot
1
0
Fork 0
mirror of https://gitlab.archlinux.org/tpowa/archboot.git synced 2024-09-19 19:40:37 +02:00
Code Issues Projects Releases Packages Wiki Activity

Don't reset progressbar, keep it running and reset to 0 on full run

Browse source
This commit is contained in:
Tobias Powalowski 2024-07-07 18:47:48 +02:00
parent 319658330f
commit d7e3406f36
1 changed files with 6 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
usr/lib/archboot/cpio/init.sh
View file

@ -28,7 +28,6 @@ _clear() {
}
# $1: start percentage $2: end percentage $3: message $4: sleep time
_progress_wait() {
_COUNT=${1}
while [[ -e /.archboot ]]; do
if [[ "${_COUNT}" -lt "${2}" ]]; then
_progress "${_COUNT}" "${3}"
@ -37,7 +36,7 @@ _progress_wait() {
_COUNT="${1}"
fi
_COUNT="$((_COUNT+1))"
sleep "${4}"
sleep "0.05"
done
}
_task() {
@ -106,19 +105,19 @@ _task() {
_initrd_stage() {
: >/.archboot
_task mount &
_progress_wait "0" "99" "\n${_KEEP}\n\nSearching rootfs on blockdevices..." "0.05"
_progress_wait "0" "99" "\n${_KEEP}\n\nSearching rootfs on blockdevices..."
: >/.archboot
_task check &
_progress_wait "0" "99" "\n${_KEEP}\n\nMounting rootfs on blockdevice..." "0.05"
_progress_wait "0" "99" "\n${_KEEP}\n\nMounting rootfs on blockdevice..."
: >/.archboot
_task btrfs &
_progress_wait "0" "99" "\n${_KEEP}\n\nCreating btrfs on /dev/zram0..." "0.05"
_progress_wait "0" "99" "\n${_KEEP}\n\nCreating btrfs on /dev/zram0..."
: >/.archboot
_task system &
_progress_wait "0" "99" "\n${_KEEP}\n\nCopying rootfs to /sysroot..." "0.05"
_progress_wait "0" "99" "\n${_KEEP}\n\nCopying rootfs to /sysroot..."
: >/.archboot
_task unmount &
_progress_wait "0" "99" "\n${_KEEP}\n\nUnmounting rootfs..." "0.05"
_progress_wait "0" "99" "\n${_KEEP}\n\nUnmounting rootfs..."
_progress "100" "The boot medium can be safely removed now."
}
# not all devices trigger autoload!