summaryrefslogtreecommitdiffstats
path: root/tools/builder_common.sh
diff options
context:
space:
mode:
authorRenato Botelho <renato@netgate.com>2016-03-04 10:52:00 -0300
committerRenato Botelho <renato@netgate.com>2016-03-04 10:52:00 -0300
commitc136dde1959479416ea5326c1eb2f622c975ff96 (patch)
tree99c606a252858b44493973c84aff77417f99288f /tools/builder_common.sh
parentd33074bac7d08799154cffc2bf3cf9959a751562 (diff)
downloadpfsense-c136dde1959479416ea5326c1eb2f622c975ff96.zip
pfsense-c136dde1959479416ea5326c1eb2f622c975ff96.tar.gz
Create missing jails on update
Diffstat (limited to 'tools/builder_common.sh')
-rw-r--r--tools/builder_common.sh7
1 files changed, 4 insertions, 3 deletions
diff --git a/tools/builder_common.sh b/tools/builder_common.sh
index 3a6e17d..55ac60c 100644
--- a/tools/builder_common.sh
+++ b/tools/builder_common.sh
@@ -2116,9 +2116,10 @@ poudriere_update_jails() {
for jail_arch in ${_archs}; do
jail_name=$(poudriere_jail_name ${jail_arch})
+ local _create_or_update="-u"
if ! poudriere jail -i -j "${jail_name}" >/dev/null 2>&1; then
- echo ">>> Poudriere jail ${jail_name} not found, skipping..." | tee -a ${LOGFILE}
- continue
+ echo ">>> Poudriere jail ${jail_name} not found, creating..." | tee -a ${LOGFILE}
+ _create_or_update="-c -v ${FREEBSD_PARENT_BRANCH} -a ${jail_arch} -m svn"
fi
if [ "${jail_arch}" = "arm.armv6" ]; then
@@ -2128,7 +2129,7 @@ poudriere_update_jails() {
fi
echo -n ">>> Updating jail ${jail_name}, it may take some time... " | tee -a ${LOGFILE}
- if ! script -aq ${LOGFILE} poudriere jail -u -j "${jail_name}" -P ${_jail_patch} ${native_xtools} >/dev/null 2>&1; then
+ if ! script -aq ${LOGFILE} poudriere jail ${_create_or_update} -j "${jail_name}" -P ${_jail_patch} ${native_xtools} >/dev/null 2>&1; then
echo "" | tee -a ${LOGFILE}
echo ">>> ERROR: Error updating jail ${jail_name}, aborting..." | tee -a ${LOGFILE}
print_error_pfS
OpenPOWER on IntegriCloud