mirror of
https://gitlab.archlinux.org/tpowa/archboot.git
synced 2024-09-20 03:50:37 +02:00
adapt sleep times in function
This commit is contained in:
parent
6db47a4dc7
commit
73e0849a4c
1 changed files with 5 additions and 5 deletions
|
@ -218,14 +218,14 @@ _new_environment() {
|
|||
# write initramfs to "${_W_DIR}"/tmp
|
||||
touch "${_W_DIR}"/.archboot
|
||||
_collect_files &
|
||||
_progress_wait "52" "69" "Collecting rootfs files in ${_W_DIR}..." "2"
|
||||
_progress "70" "Cleanup ${_W_DIR}..."
|
||||
_progress_wait "52" "78" "Collecting rootfs files in ${_W_DIR}..." "1"
|
||||
_progress "79" "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 "75" "Moving rootfs to ${_RAM}..."
|
||||
_progress "80" "Moving rootfs to ${_RAM}..."
|
||||
mv ${_W_DIR}/tmp/* /${_RAM}/
|
||||
# cleanup mkinitcpio directories and files
|
||||
_progress "95" "Cleanup ${_RAM}..."
|
||||
|
@ -247,7 +247,7 @@ _new_environment() {
|
|||
fi
|
||||
|
||||
_C_DIR="${_W_DIR}/tmp"
|
||||
_progress "75" "Preserving Basic Setup values..."
|
||||
_progress "79" "Preserving Basic Setup values..."
|
||||
if [[ -e '/.localize' ]]; then
|
||||
cp /etc/{locale.gen,locale.conf} "${_C_DIR}"/etc
|
||||
cp /.localize "${_C_DIR}"/
|
||||
|
@ -280,7 +280,7 @@ _new_environment() {
|
|||
_progress "80" "Creating initramfs ${_RAM}/${_INITRD}..."
|
||||
touch "${_W_DIR}"/.archboot
|
||||
_create_initramfs &
|
||||
_progress_wait "81" "94" "Creating initramfs ${_RAM}/${_INITRD}..." "0.2"
|
||||
_progress_wait "81" "94" "Creating initramfs ${_RAM}/${_INITRD}..." "0.3"
|
||||
_progress "95" "Cleanup ${_W_DIR}..."
|
||||
cd /
|
||||
_kill_w_dir
|
||||
|
|
Loading…
Reference in a new issue