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

adapt sleep times in function

Browse source
This commit is contained in:
Tobias Powalowski 2023-08-03 11:14:04 +02:00
parent b67f6c1ab4
commit 1152382c36
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/update/manage.sh
View file

@ -214,18 +214,17 @@ _new_environment() {
_progress "50" "Moving kernel ${_VMLINUZ} to ${_RAM}/${_VMLINUZ}..."
# use ramfs to get immediate free space on file deletion
mv "${_W_DIR}/boot/${_VMLINUZ}" ${_RAM}/ || exit 1
_progress "51" "Collecting rootfs files in ${_W_DIR}..."
# write initramfs to "${_W_DIR}"/tmp
touch "${_W_DIR}"/.archboot
_collect_files &
_progress_wait "52" "78" "Collecting rootfs files in ${_W_DIR}..." "1"
_progress "79" "Cleanup ${_W_DIR}..."
_progress_wait "51" "78" "Collecting rootfs files in ${_W_DIR}..." "1"
_progress "85" "Cleanup ${_W_DIR}..."
find "${_W_DIR}"/. -mindepth 1 -maxdepth 1 ! -name 'tmp' -exec rm -rf {} \;
_clean_kernel_cache
_ram_check
# local switch, don't kexec on local image
if [[ -e /var/cache/pacman/pkg/archboot.db ]]; then
_progress "80" "Moving rootfs to ${_RAM}..."
_progress "86" "Moving rootfs to ${_RAM}..."
mv ${_W_DIR}/tmp/* /${_RAM}/
# cleanup mkinitcpio directories and files
_progress "95" "Cleanup ${_RAM}..."
@ -247,7 +246,7 @@ _new_environment() {
fi
_C_DIR="${_W_DIR}/tmp"
_progress "79" "Preserving Basic Setup values..."
_progress "86" "Preserving Basic Setup values..."
if [[ -e '/.localize' ]]; then
cp /etc/{locale.gen,locale.conf} "${_C_DIR}"/etc
cp /.localize "${_C_DIR}"/
@ -277,10 +276,10 @@ _new_environment() {
cp -ar /etc/pacman.d/gnupg "${_C_DIR}"/etc/pacman.d
cp /.pacsetup "${_C_DIR}"/
fi
_progress "80" "Creating initramfs ${_RAM}/${_INITRD}..."
_progress "87" "Creating initramfs ${_RAM}/${_INITRD}..."
touch "${_W_DIR}"/.archboot
_create_initramfs &
_progress_wait "81" "94" "Creating initramfs ${_RAM}/${_INITRD}..." "0.4"
_progress_wait "81" "94" "Creating initramfs ${_RAM}/${_INITRD}..." "1"
_progress "95" "Cleanup ${_W_DIR}..."
cd /
_kill_w_dir