remove progress_wait

This commit is contained in:
Tobias Powalowski 2023-11-17 13:07:35 +01:00
parent 128d64f9d9
commit dc2ab8fffd

View file

@ -33,22 +33,20 @@ _memory_error () {
_switch_root_zram() {
if [[ "${TTY}" = "tty1" ]]; then
clear
: > /.archboot
_progress "1" "Creating btrfs on /dev/zram0..."
[[ -d /sysroot ]] || mkdir /sysroot
(modprobe -q zram
modprobe -q zstd
echo "1" >/sys/block/zram0/reset
echo "zstd" >/sys/block/zram0/comp_algorithm
echo "5G" >/sys/block/zram0/disksize
mkfs.btrfs /dev/zram0 &>"${_NO_LOG}"
mount -o discard /dev/zram0 /sysroot &>"${_NO_LOG}"
rm /.archboot) &
_progress_wait "1" "30" "Creating btrfs on /dev/zram0..." "0.1"
modprobe -q zram
modprobe -q zstd
echo "1" >/sys/block/zram0/reset
echo "zstd" >/sys/block/zram0/comp_algorithm
echo "5G" >/sys/block/zram0/disksize
mkfs.btrfs /dev/zram0 &>"${_NO_LOG}"
mount -o discard /dev/zram0 /sysroot &>"${_NO_LOG}"
: > /.archboot
(tar -C / --exclude="./dev/*" --exclude="./proc/*" --exclude="./sys/*" \
--exclude="./run/*" --exclude="./mnt/*" --exclude="./tmp/*" --exclude="./sysroot/*" \
-clpf - . | tar -C /sysroot -xlspf - &>"${_NO_LOG}"; rm /.archboot) &
_progress_wait "31" "99" "Copying archboot rootfs to /sysroot..." "0.125"
_progress_wait "2" "99" "Copying archboot rootfs to /sysroot..." "0.125"
# cleanup directories and files
rm -r /sysroot/sysroot &>"${_NO_LOG}"
rm /sysroot/init &>"${_NO_LOG}"