diff options
| author | Renato Botelho <renato@netgate.com> | 2015-10-14 06:38:20 -0300 |
|---|---|---|
| committer | Renato Botelho <renato@netgate.com> | 2015-10-14 06:38:20 -0300 |
| commit | 1a850fc9347d0fd7fde394c06411597858fd301e (patch) | |
| tree | ac5d3cf8cecc04f55275c94237653b06bbeb3dbe /src/usr/local/sbin | |
| parent | 1ab880ef232ee94d08700f3ca3717ad69fcdb247 (diff) | |
| download | pfsense-1a850fc9347d0fd7fde394c06411597858fd301e.zip pfsense-1a850fc9347d0fd7fde394c06411597858fd301e.tar.gz | |
Move kill tail process to _exit()
Diffstat (limited to 'src/usr/local/sbin')
| -rwxr-xr-x | src/usr/local/sbin/pfSense-upgrade | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/usr/local/sbin/pfSense-upgrade b/src/usr/local/sbin/pfSense-upgrade index 3bc131f..d8e5c2b 100755 --- a/src/usr/local/sbin/pfSense-upgrade +++ b/src/usr/local/sbin/pfSense-upgrade @@ -128,6 +128,10 @@ _exit() { /etc/rc.conf_mount_ro fi + if [ -n "${progress_fifo_tail_pid}" ]; then + kill ${progress_fifo_tail_pid} + fi + local _rc=${1:-"0"} # If EVENT_PIPE is defined, GUI is calling @@ -656,7 +660,7 @@ if [ -n "${progress_fifo}" ]; then # json file - logfile - ".txt" + ".json" progress_file=${logfile%.*}.json tail -f ${progress_fifo} > ${progress_file} & - tailpid=$! + progress_fifo_tail_pid=$! export EVENT_PIPE="${progress_fifo}" fi @@ -678,6 +682,4 @@ case "${action}" in _exit 1 esac -kill ${tailpid} - _exit 0 |
