From owner-svn-src-projects@FreeBSD.ORG Fri Apr 27 17:25:13 2012 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id E003B1065672; Fri, 27 Apr 2012 17:25:13 +0000 (UTC) (envelope-from bapt@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id CC79F8FC16; Fri, 27 Apr 2012 17:25:13 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q3RHPDRr016466; Fri, 27 Apr 2012 17:25:13 GMT (envelope-from bapt@svn.freebsd.org) Received: (from bapt@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q3RHPDwJ016464; Fri, 27 Apr 2012 17:25:13 GMT (envelope-from bapt@svn.freebsd.org) Message-Id: <201204271725.q3RHPDwJ016464@svn.freebsd.org> From: Baptiste Daroussin Date: Fri, 27 Apr 2012 17:25:13 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r234733 - projects/portbuild/scripts X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 27 Apr 2012 17:25:14 -0000 Author: bapt Date: Fri Apr 27 17:25:13 2012 New Revision: 234733 URL: http://svn.freebsd.org/changeset/base/234733 Log: Remove wrong jail options added by mistake Modified: projects/portbuild/scripts/portbuild Modified: projects/portbuild/scripts/portbuild ============================================================================== --- projects/portbuild/scripts/portbuild Fri Apr 27 15:35:09 2012 (r234732) +++ projects/portbuild/scripts/portbuild Fri Apr 27 17:25:13 2012 (r234733) @@ -296,8 +296,7 @@ done # XXX bapt: the network 127.0.0.1 allows ports like postfix do not fail querying a network # device jail -c persist name=${jname} ip4.addr=127.0.0.1 ip6=disable path=${chroot} \ - host.hostname=${jname} allow.sysvipc allow.socket_af allow.raw_sockets \ - allow.enforce_statfs allow.chflags_allowed + host.hostname=${jname} allow.sysvipc allow.socket_af allow.raw_sockets jexec -U root ${jname} /usr/sbin/service ldconfig start @@ -340,13 +339,11 @@ if [ "${error}" = 0 ]; then # restart the jail with network for the fetch part jail -r ${jname} jail -c persist name=${jname} ip4=inherit ip6=inherit path=${chroot} \ - host.hostname=${jname} allow.sysvipc allow.socket_af allow.raw_sockets \ - allow.enforce_statfs allow.chflags_allowed + host.hostname=${jname} allow.sysvipc allow.socket_af allow.raw_sockets jexec -U root ${jname} /buildscript ${dirname} 1 "$ED" "$PD" "$FD" "$BD" "$RD" "$PKGD" 2>&1 | tee -a ${chroot}/tmp/${pkgname}.log jail -r ${jname} jail -c persist name=${jname} ip4.addr=127.0.0.1 ip6=disable path=${chroot} \ - host.hostname=${jname} allow.sysvipc allow.socket_af allow.raw_sockets \ - allow.enforce_statfs allow.chflags_allowed + host.hostname=${jname} allow.sysvipc allow.socket_af allow.raw_sockets if [ -f ${chroot}/tmp/status ]; then error=$(cat ${chroot}/tmp/status) else