diff options
| author | Renato Botelho <renato@netgate.com> | 2015-09-18 13:52:19 -0300 |
|---|---|---|
| committer | Renato Botelho <renato@netgate.com> | 2015-09-18 13:52:19 -0300 |
| commit | 39ef49f648f5bca7c19d7ae2d4e0bfa0c0221ea4 (patch) | |
| tree | 8dcf621c7b12f19a136c8be8598bdf4035ac50d5 /tools | |
| parent | e8a3a81b65c7e5551b840d7aec7cca41b3e28867 (diff) | |
| download | pfsense-39ef49f648f5bca7c19d7ae2d4e0bfa0c0221ea4.zip pfsense-39ef49f648f5bca7c19d7ae2d4e0bfa0c0221ea4.tar.gz | |
Add a workaround to make sure images are compressed before rsync, for some reason wait is not working as expected
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/builder_common.sh | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/tools/builder_common.sh b/tools/builder_common.sh index 198bb2a..b82a2af 100644 --- a/tools/builder_common.sh +++ b/tools/builder_common.sh @@ -782,8 +782,10 @@ awk ' # Wrap up the show, Johnny echo ">>> NanoBSD Image completed for size: $_NANO_MEDIASIZE." | tee -a ${LOGFILE} - gzip -f $IMG & - gzip -f $IMGUPDATE & + gzip -qf $IMG & + _bg_pids="${_bg_pids}${_bg_pids:+ }$!" + gzip -qf $IMGUPDATE & + _bg_pids="${_bg_pids}${_bg_pids:+ }$!" done unset IMG @@ -1184,6 +1186,7 @@ create_iso_image() { print_error_pfS fi gzip -qf $ISOPATH & + _bg_pids="${_bg_pids}${_bg_pids:+ }$!" echo ">>> ISO created: $(LC_ALL=C date)" | tee -a ${LOGFILE} } @@ -1226,6 +1229,7 @@ create_memstick_image() { trap "-" 1 2 15 EXIT mdconfig -d -u ${MD} 2>&1 | tee -a ${LOGFILE} gzip -qf $MEMSTICKPATH & + _bg_pids="${_bg_pids}${_bg_pids:+ }$!" echo ">>> MEMSTICK created: $(LC_ALL=C date)" | tee -a ${LOGFILE} } @@ -1287,6 +1291,7 @@ create_memstick_serial_image() { trap "-" 1 2 15 EXIT mdconfig -d -u ${MD} 2>&1 >> ${LOGFILE} gzip -qf $MEMSTICKSERIALPATH & + _bg_pids="${_bg_pids}${_bg_pids:+ }$!" echo ">>> MEMSTICKSERIAL created: $(LC_ALL=C date)" | tee -a ${LOGFILE} } @@ -1350,6 +1355,7 @@ create_memstick_adi_image() { trap "-" 1 2 15 EXIT mdconfig -d -u ${MD} 2>&1 >> ${LOGFILE} gzip -qf $MEMSTICKADIPATH & + _bg_pids="${_bg_pids}${_bg_pids:+ }$!" echo ">>> MEMSTICKADI created: $(LC_ALL=C date)" | tee -a ${LOGFILE} } |
