CSEC_PUBLIC/securityonion
1
0
Fork 0
mirror of https://github.com/Security-Onion-Solutions/securityonion.git synced 2025-12-07 01:32:47 +01:00
Code Issues Packages Projects Releases Wiki Activity

Save descriptors while inside the progress pipe

Browse Source
This commit is contained in:
Jason Ertel
2020-11-16 14:10:48 -05:00
parent 2ff738a61c
commit a343e3f31e
1 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
setup/so-functions
View File

@@ -23,11 +23,6 @@ CONTAINER_REGISTRY=quay.io
SOVERSION=$(cat ../VERSION) SOVERSION=$(cat ../VERSION)
# Duplicate stdout and stderr file descriptors for use with whiptail
# Using >&10 or >&20 will override any ancestral >> or > redirects and send
# to stdout or stderr, repsectively.
exec 10>&1 20>&2
log() { log() {
msg=$1 msg=$1
level=${2:-I} level=${2:-I}
@@ -883,7 +878,7 @@ docker_seed_update() {
fi fi
((docker_seed_update_percent=docker_seed_update_percent+percent_delta)) ((docker_seed_update_percent=docker_seed_update_percent+percent_delta))
# Backup current output descriptors and reset to normal # Backup current output descriptors and reset to saved descriptors from docker_seed_registry function
exec 8>&1 9>&2 1>&10 2>&20 exec 8>&1 9>&2 1>&10 2>&20
set_progress_str "$docker_seed_update_percent" "Downloading $name" set_progress_str "$docker_seed_update_percent" "Downloading $name"
@@ -905,6 +900,10 @@ docker_seed_registry() {
fi fi
docker_seed_update_percent=25 docker_seed_update_percent=25
# Save output descriptors for use in docker_seed_registry_update function
exec 10>&1 20>&2
update_docker_containers 'netinstall' '' 'docker_seed_update' >> "$setup_log" 2>&1 update_docker_containers 'netinstall' '' 'docker_seed_update' >> "$setup_log" 2>&1
else else
tar xvf /nsm/docker-registry/docker/registry.tar -C /nsm/docker-registry/docker >> "$setup_log" 2>&1 tar xvf /nsm/docker-registry/docker/registry.tar -C /nsm/docker-registry/docker >> "$setup_log" 2>&1