summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorRenato Botelho <renato@netgate.com>2016-05-16 17:37:28 -0300
committerRenato Botelho <renato@netgate.com>2016-05-16 17:37:39 -0300
commit17206e813c892330e089f4e6e6384f6a1973037c (patch)
tree8b6c5ded02144c342964eb01351811464d2ec11e /tools
parent5c15553d713d9dcd171c11d613ebddc52e9eda87 (diff)
downloadpfsense-17206e813c892330e089f4e6e6384f6a1973037c.zip
pfsense-17206e813c892330e089f4e6e6384f6a1973037c.tar.gz
Add a parameter to skip final rsync
Diffstat (limited to 'tools')
-rw-r--r--tools/builder_common.sh2
-rw-r--r--tools/builder_defaults.sh1
2 files changed, 2 insertions, 1 deletions
diff --git a/tools/builder_common.sh b/tools/builder_common.sh
index 46a35bb..9e45770 100644
--- a/tools/builder_common.sh
+++ b/tools/builder_common.sh
@@ -1937,7 +1937,7 @@ pkg_repo_rsync() {
print_error_pfS
fi
- if [ -z "${USE_PKG_REPO_STAGING}" -o -z "${PKG_FINAL_RSYNC_HOSTNAME}" ]; then
+ if [ -z "${USE_PKG_REPO_STAGING}" -o -n "${SKIP_FINAL_RSYNC}" ]; then
return
fi
diff --git a/tools/builder_defaults.sh b/tools/builder_defaults.sh
index 3b256c7..b9e2493 100644
--- a/tools/builder_defaults.sh
+++ b/tools/builder_defaults.sh
@@ -300,6 +300,7 @@ export PKG_FINAL_RSYNC_HOSTNAME=${PKG_FINAL_RSYNC_HOSTNAME:-"beta.pfsense.org"}
export PKG_FINAL_RSYNC_USERNAME=${PKG_FINAL_RSYNC_USERNAME:-"wwwsync"}
export PKG_FINAL_RSYNC_SSH_PORT=${PKG_FINAL_RSYNC_SSH_PORT:-"22"}
export PKG_FINAL_RSYNC_DESTDIR=${PKG_FINAL_RSYNC_DESTDIR:-"/usr/local/www/beta/packages"}
+export SKIP_FINAL_RSYNC=${SKIP_FINAL_RSYNC:-}
unset _IS_RELEASE
unset CORE_PKG_DATESTRING
OpenPOWER on IntegriCloud