diff options
| author | Baptiste Daroussin <bapt@FreeBSD.org> | 2013-01-06 17:43:07 +0400 |
|---|---|---|
| committer | Baptiste Daroussin <bapt@FreeBSD.org> | 2013-01-06 17:43:07 +0400 |
| commit | 653b2ef65e50c20e643b5652ba81e64df5e12771 (patch) | |
| tree | 9c7012071b2a64f65dfb18d5a680f530da755310 | |
| parent | faf9e7676c73d0c5350a24756fa32e8c5b89f3cf (diff) | |
| parent | fd389eacb68e072cc58af649ac3b9514cb4cb80f (diff) | |
Merge from trunkunionfs
| -rwxr-xr-x | src/poudriere.d/common.sh | 2 | ||||
| -rwxr-xr-x | src/poudriere.d/jail.sh | 2 | ||||
| -rw-r--r-- | src/poudriere.d/options.sh | 9 |
3 files changed, 10 insertions, 3 deletions
diff --git a/src/poudriere.d/common.sh b/src/poudriere.d/common.sh index 32a2928e..5e8492b7 100755 --- a/src/poudriere.d/common.sh +++ b/src/poudriere.d/common.sh @@ -775,8 +775,8 @@ EOF save_wrkdir() { [ $# -ne 3 ] && eargs port portdir phase local port="$1" - local phase="$2" local portdir="$2" + local phase="$3" local tardir=${POUDRIERE_DATA}/wrkdirs/${JAILNAME%-job-*}/${PTNAME} local tarname=${tardir}/${PKGNAME}.${WRKDIR_ARCHIVE_FORMAT} local mnted_portdir=${JAILMNT}/wrkdirs/${portdir} diff --git a/src/poudriere.d/jail.sh b/src/poudriere.d/jail.sh index ea45163a..9d3dd598 100755 --- a/src/poudriere.d/jail.sh +++ b/src/poudriere.d/jail.sh @@ -299,6 +299,8 @@ create_jail() { test -z ${VERSION} && usage + [ "${JAILNAME#*.*}" = "${JAILNAME}" ] || err 1 "The jailname can not contain a period (.). See jail(8)" + if [ -z ${JAILMNT} ]; then [ -z ${BASEFS} ] && err 1 "Please provide a BASEFS variable in your poudriere.conf" JAILMNT=${BASEFS}/jails/${JAILNAME} diff --git a/src/poudriere.d/options.sh b/src/poudriere.d/options.sh index c2a45c08..b4b8ce6c 100644 --- a/src/poudriere.d/options.sh +++ b/src/poudriere.d/options.sh @@ -109,6 +109,11 @@ for origin in ${LISTPORTS}; do [ -d ${PORTSDIR}/${origin} ] || err 1 "No such ports ${origin}" make PORT_DBDIR=${PORT_DBDIR} \ -C ${PORTSDIR}/${origin} \ - ${COMMAND} \ - ${DO_RECURSE:+${RECURSE_COMMAND}} + ${COMMAND} + + if [ -n "${DO_RECURSE}" ]; then + make PORT_DBDIR=${PORT_DBDIR} \ + -C ${PORTSDIR}/${origin} \ + ${RECURSE_COMMAND} + fi done |