diff options
| author | Baptiste Daroussin <bapt@FreeBSD.org> | 2014-04-23 16:39:51 +0400 |
|---|---|---|
| committer | Baptiste Daroussin <bapt@FreeBSD.org> | 2014-04-23 16:39:51 +0400 |
| commit | 83e979d7982350cacac76f6dfcb1affe5d6c4d6a (patch) | |
| tree | c6e2810e794270bc4e36d738c93479cda55a0e90 | |
| parent | f1833099ffb59cfbbf37fefb184921eea6f53b76 (diff) | |
Rename -network to -n to reduce inpact on the length restricted jailname
Discussed with: bdrewery
| -rwxr-xr-x | src/share/poudriere/common.sh | 4 | ||||
| -rwxr-xr-x | src/share/poudriere/jail.sh | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/share/poudriere/common.sh b/src/share/poudriere/common.sh index 7e3bb3d1..a00f931e 100755 --- a/src/share/poudriere/common.sh +++ b/src/share/poudriere/common.sh @@ -1480,7 +1480,7 @@ _real_build_port() { mkdir -p ${mnt}/portdistfiles echo "DISTDIR=/portdistfiles" >> ${mnt}/etc/make.conf gather_distfiles ${portdir} ${DISTFILES_CACHE} ${mnt}/portdistfiles || return 1 - JNETNAME="network" + JNETNAME="n" JUSER=root ;; extract) @@ -3392,7 +3392,7 @@ build_repo() { -o ${MASTERMNT}/tmp/packages ${MASTERMNT}/packages \ ${SIGNING_COMMAND:+signing_command: ${SIGNING_COMMAND}} else - JNETNAME="network" + JNETNAME="n" injail /poudriere/pkg-static repo -o /tmp/packages \ /packages \ ${SIGNING_COMMAND:+signing_command: ${SIGNING_COMMAND}} diff --git a/src/share/poudriere/jail.sh b/src/share/poudriere/jail.sh index 1d5679b7..e4f0c744 100755 --- a/src/share/poudriere/jail.sh +++ b/src/share/poudriere/jail.sh @@ -164,7 +164,7 @@ update_jail() { MASTERNAME=${JAILNAME} [ -n "${RESOLV_CONF}" ] && cp -v "${RESOLV_CONF}" "${JAILMNT}/etc/" do_jail_mounts ${JAILMNT} ${ARCH} - JNETNAME="network" + JNETNAME="n" if [ -z "${TORELEASE}" ]; then injail env PAGER=/bin/cat /usr/sbin/freebsd-update fetch install else @@ -754,7 +754,7 @@ case "${CREATE}${INFO}${LIST}${STOP}${START}${DELETE}${UPDATE}${RENAME}" in export MASTERNAME=${JAILNAME}-${PTNAME}${SETNAME:+-${SETNAME}} export MASTERMNT=${POUDRIERE_DATA}/build/${MASTERNAME}/ref jail_start ${JAILNAME} ${PTNAME} ${SETNAME} - JNETNAME="network" + JNETNAME="n" ;; 00000100) test -z ${JAILNAME} && usage |