mirror of
https://gitlab.archlinux.org/tpowa/archboot.git
synced 2024-09-20 03:50:37 +02:00
show progress on container creation
This commit is contained in:
parent
8179a63bd9
commit
eda959c09e
1 changed files with 11 additions and 3 deletions
|
@ -23,6 +23,8 @@ _kill_w_dir() {
|
||||||
}
|
}
|
||||||
|
|
||||||
_create_container() {
|
_create_container() {
|
||||||
|
[[ -d "${_W_DIR}" ]] || mkdir -p "${_W_DIR}"
|
||||||
|
touch "${_W_DIR}"/.archboot
|
||||||
# create container without package cache
|
# create container without package cache
|
||||||
if [[ -n "${_L_COMPLETE}" ]]; then
|
if [[ -n "${_L_COMPLETE}" ]]; then
|
||||||
"archboot-${_RUNNING_ARCH}-create-container.sh" "${_W_DIR}" -cc -cp >"${_LOG}" 2>&1 || exit 1
|
"archboot-${_RUNNING_ARCH}-create-container.sh" "${_W_DIR}" -cc -cp >"${_LOG}" 2>&1 || exit 1
|
||||||
|
@ -43,6 +45,7 @@ _create_container() {
|
||||||
"archboot-${_RUNNING_ARCH}-create-container.sh" "${_W_DIR}" -cc >"${_LOG}" 2>&1 || exit 1
|
"archboot-${_RUNNING_ARCH}-create-container.sh" "${_W_DIR}" -cc >"${_LOG}" 2>&1 || exit 1
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
rm "${_W_DIR}"/.archboot
|
||||||
}
|
}
|
||||||
|
|
||||||
_network_check() {
|
_network_check() {
|
||||||
|
@ -178,13 +181,18 @@ _new_environment() {
|
||||||
_clean_archboot
|
_clean_archboot
|
||||||
_clean_kernel_cache
|
_clean_kernel_cache
|
||||||
_COUNT=10
|
_COUNT=10
|
||||||
while _create_container; do
|
(_create_container &)
|
||||||
if [[ "$((_COUNT))" -gt 10 ]]; then
|
while [[ -e "${_W_DIR}/.archboot" ]]; do
|
||||||
|
if [[ "${_COUNT}" -gt 10 ]]; then
|
||||||
_progress "$((_COUNT))" "Generating container in ${_W_DIR}..."
|
_progress "$((_COUNT))" "Generating container in ${_W_DIR}..."
|
||||||
fi
|
fi
|
||||||
if [[ "$((_COUNT))" -gt 49 ]]; then
|
if [[ "${_COUNT}" -gt 49 ]]; then
|
||||||
_progress "49" "Generating container in ${_W_DIR}..."
|
_progress "49" "Generating container in ${_W_DIR}..."
|
||||||
fi
|
fi
|
||||||
|
# abort after 10 minutes
|
||||||
|
if [[ "${_COUNT}" -gt 300 ]]; then
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
_COUNT="$((_COUNT+1))"
|
_COUNT="$((_COUNT+1))"
|
||||||
sleep 2
|
sleep 2
|
||||||
done
|
done
|
||||||
|
|
Loading…
Reference in a new issue