summaryrefslogtreecommitdiffstats
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:40:13 -0300
commit8229d6d876444b9aa8b991dc1f11a77caf34bbaa (patch)
tree82d7abeaa59e57cef498ab70ada818515420d603
parent53f6f76f30e2b191ac9eae1435312fd59cdb8483 (diff)
downloadpfsense-2.3.1.zip
pfsense-2.3.1.tar.gz
Add a parameter to skip final rsyncv2.3.1
-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 2a183b3..6a019e7 100644
--- a/tools/builder_common.sh
+++ b/tools/builder_common.sh
@@ -1938,7 +1938,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 46c024f..8deb017 100644
--- a/tools/builder_defaults.sh
+++ b/tools/builder_defaults.sh
@@ -284,6 +284,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