diff options
| author | Bryan Drewery <bryan@shatow.net> | 2014-03-02 00:00:54 +0400 |
|---|---|---|
| committer | Bryan Drewery <bryan@shatow.net> | 2014-03-02 00:00:54 +0400 |
| commit | f82f7e13e918bc8fc658104a197753967a7a20de (patch) | |
| tree | 90df90f1b9d7a1cbafa286b2af75534c848aaaa6 /src/share/poudriere/testport.sh | |
| parent | 3fca27885fab90be2f677d1eaa5468453dcbb0fc (diff) | |
testport -i: Use a local.conf instead of PACKAGESITE
MFH
Diffstat (limited to 'src/share/poudriere/testport.sh')
| -rwxr-xr-x | src/share/poudriere/testport.sh | 18 |
1 files changed, 17 insertions, 1 deletions
diff --git a/src/share/poudriere/testport.sh b/src/share/poudriere/testport.sh index 68a3a2f4..729e98e8 100755 --- a/src/share/poudriere/testport.sh +++ b/src/share/poudriere/testport.sh @@ -252,10 +252,26 @@ if [ $INTERACTIVE_MODE -gt 0 ]; then jstop jstart 1 + # Create a pkgng repo configuration, and disable FreeBSD + if [ ${PKGNG} -eq 1 ]; then + msg "Installing local Pkg repository to ${LOCALBASE}/etc/pkg/repos" + mkdir -p ${MASTERMNT}${LOCALBASE}/etc/pkg/repos + cat > ${MASTERMNT}${LOCALBASE}/etc/pkg/repos/local.conf << EOF +FreeBSD: { + enabled: no +} + +local: { + url: "file:///packages", + enabled: yes +} +EOF + fi + if [ $INTERACTIVE_MODE -eq 1 ]; then msg "Entering interactive test mode. Type 'exit' when done." injail env -i TERM=${SAVED_TERM} \ - PACKAGESITE="file:///packages" /usr/bin/login -fp root + /usr/bin/login -fp root [ -z "${failed_phase}" ] || err 1 "Build failed in phase: ${failed_phase}" elif [ $INTERACTIVE_MODE -eq 2 ]; then msg "Leaving jail ${MASTERNAME} running, mounted at ${MASTERMNT} for interactive run testing" |