summaryrefslogtreecommitdiffstats
path: root/src/usr/local/sbin
diff options
context:
space:
mode:
authorRenato Botelho <renato@netgate.com>2015-12-10 08:46:55 -0200
committerRenato Botelho <renato@netgate.com>2015-12-10 12:20:56 -0200
commitb3b10d30794a60ed9a781cc3c8e0d29b774bf86e (patch)
tree8852d33d8b07fcdb72f2a0404adb858db3025a40 /src/usr/local/sbin
parent48ef563059bb973a8bddc394d1f61e2b9c15db42 (diff)
downloadpfsense-b3b10d30794a60ed9a781cc3c8e0d29b774bf86e.zip
pfsense-b3b10d30794a60ed9a781cc3c8e0d29b774bf86e.tar.gz
Fix #5598 - Nanobsd upgrade fails on GUI
When -p is used on nanobsd, progres socket must be created on secondary partition (chroot_dir) otherwise pkg, that runs with -c chroot_dir, will not be able to find UNIX socket to connect and send events
Diffstat (limited to 'src/usr/local/sbin')
-rwxr-xr-xsrc/usr/local/sbin/pfSense-upgrade8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/usr/local/sbin/pfSense-upgrade b/src/usr/local/sbin/pfSense-upgrade
index fb20eec..e747b0e 100755
--- a/src/usr/local/sbin/pfSense-upgrade
+++ b/src/usr/local/sbin/pfSense-upgrade
@@ -157,16 +157,16 @@ pkg_with_pb() {
local _event_pipe=""
if [ -n "${progress_socket}" ]; then
- if [ -e "${progress_socket}" ]; then
- rm -f ${progress_socket}
+ if [ -e "${chroot_dir}${progress_socket}" ]; then
+ rm -f ${chroot_dir}${progress_socket}
fi
_event_pipe="-o EVENT_PIPE=${progress_socket}"
- nc -lU ${progress_socket} >> ${progress_file} &
+ nc -lU ${chroot_dir}${progress_socket} >> ${progress_file} &
nc_pid=$!
- while [ ! -e "${progress_socket}" ]; do
+ while [ ! -e "${chroot_dir}${progress_socket}" ]; do
sleep 0.1
done
fi
OpenPOWER on IntegriCloud