diff options
| author | Bryan Drewery <bdrewery@FreeBSD.org> | 2019-09-18 19:34:50 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-09-18 19:34:50 +0300 |
| commit | 2c6ad4d5c17583827ce820cc6104cc668e6d49bf (patch) | |
| tree | e21c91e12a8dc08e7360c8995e6eaae3004d00d5 /src | |
| parent | e0ed085853261e42a377e75cd27e3d1ca7ca00d0 (diff) | |
| parent | 25351a851e81779cde065ec11998764714d4b369 (diff) | |
Merge pull request #715 from freebsd/ci
Cirrus CI support
Diffstat (limited to 'src')
| -rwxr-xr-x | src/share/poudriere/jail.sh | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/src/share/poudriere/jail.sh b/src/share/poudriere/jail.sh index 4dafd48d..3eb4c7c4 100755 --- a/src/share/poudriere/jail.sh +++ b/src/share/poudriere/jail.sh @@ -173,8 +173,12 @@ cleanup_new_jail() { update_version() { local version_extra="$1" - eval `grep "^[RB][A-Z]*=" ${SRC_BASE}/sys/conf/newvers.sh ` - RELEASE=${REVISION}-${BRANCH} + if [ -r "${SRC_BASE}/sys/conf/newvers.sh" ]; then + eval `grep "^[RB][A-Z]*=" ${SRC_BASE}/sys/conf/newvers.sh ` + RELEASE=${REVISION}-${BRANCH} + else + RELEASE=$(jget ${JAILNAME} version) + fi [ -n "${version_extra}" ] && RELEASE="${RELEASE} ${version_extra}" jset ${JAILNAME} version "${RELEASE}" @@ -619,7 +623,7 @@ install_from_ftp() { esac DISTS="${DISTS} base games" - [ -z "${SRCPATH}" ] && DISTS="${DISTS} src" + [ -z "${SRCPATH}" -a "${NO_SRC:-no}" = "no" ] && DISTS="${DISTS} src" DISTS="${DISTS} ${EXTRA_DISTS}" case "${V}" in @@ -726,7 +730,8 @@ install_from_ftp() { fetch_file ${JAILMNT}/fromftp/MANIFEST ${URL}/MANIFEST fi - DISTS="${DISTS} lib32" + [ "${NO_LIB32:-no}" = "no" ] && + DISTS="${DISTS} lib32" [ -n "${KERNEL}" ] && DISTS="${DISTS} kernel" [ -s "${JAILMNT}/fromftp/MANIFEST" ] || err 1 "Empty MANIFEST file." for dist in ${DISTS}; do @@ -1225,6 +1230,7 @@ case "${CREATE}${INFO}${LIST}${STOP}${START}${DELETE}${UPDATE}${RENAME}" in ;; 00000100) [ -z "${JAILNAME}" ] && usage JAILNAME + jail_exists ${JAILNAME} || err 1 "No such jail: ${JAILNAME}" confirm_if_tty "Are you sure you want to delete the jail?" || \ err 1 "Not deleting jail" maybe_run_queued "${saved_argv}" |