1
0
mirror of https://git.FreeBSD.org/ports.git synced 2024-11-20 00:21:35 +00:00

Fix ezjail use of make distribution and the path to snapshots on the mirrors.

PR:		230690
Approved by:	maintainer timeout
This commit is contained in:
Brad Davis 2018-08-31 20:37:20 +00:00
parent aedca5645a
commit 236c9afbd3
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=478609
2 changed files with 21 additions and 0 deletions

View File

@ -2,6 +2,7 @@
PORTNAME= ezjail
PORTVERSION= 3.4.2
PORTREVISION= 1
CATEGORIES= sysutils
MASTER_SITES= http://erdgeist.org/arts/software/ezjail/

View File

@ -0,0 +1,20 @@
--- ezjail-admin.orig 2018-08-17 10:07:06 UTC
+++ ezjail-admin
@@ -335,7 +335,7 @@ ezjail_queryftpserver () {
unset _ret
echo -n "Querying your ftp-server... "
TIFS=${IFS}; IFS=
- for ezjail_path in pub/FreeBSD/releases pub/FreeBSD/snapshot pub/FreeBSD releases snapshots pub/FreeBSD-Archive/old-releases NO; do
+ for ezjail_path in pub/FreeBSD/releases pub/FreeBSD/snapshots pub/FreeBSD releases snapshots pub/FreeBSD-Archive/old-releases NO; do
if [ ${ezjail_path} = "NO" ]; then
echo "Warning: I am having problems querying the ftp server you specified (${ezjail_disturi})."
_ret=1; break
@@ -1053,7 +1053,7 @@ setup|update)
# make and setup our world, then split basejail and newjail
cd "${ezjail_sourcetree}" && env DESTDIR="${ezjail_jailfull}" make ${ezjail_installaction} || exerr "Error: The command 'make ${ezjail_installaction}' failed.\n Refer to the error report(s) above."
- cd "${ezjail_sourcetree}/etc" && env DESTDIR="${ezjail_jailfull}" make distribution || exerr "Error: The command 'make distribution' failed.\n Refer to the error report(s) above."
+ cd "${ezjail_sourcetree}" && env DESTDIR="${ezjail_jailfull}" make distribution || exerr "Error: The command 'make distribution' failed.\n Refer to the error report(s) above."
ezjail_splitworld
fi # installaction="none"