Date: Thu, 11 Feb 2010 10:55:23 +0800 (CST) From: CHAO Shin <quakelee@geekcn.org> To: FreeBSD-gnats-submit@FreeBSD.org Subject: bin/143785: add passive mode to pkg_add cdrtools in jail when making release Message-ID: <20100211025523.66300E0477@tarsier.delphij.net> Resent-Message-ID: <201002110300.o1B302rZ055645@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 143785
>Category: bin
>Synopsis: add passive mode to pkg_add cdrtools in jail when making release
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Thu Feb 11 03:00:01 UTC 2010
>Closed-Date:
>Last-Modified:
>Originator: CHAO Shin
>Release: FreeBSD 8.0-RELEASE-p2 amd64
>Organization:
GeekCN
>Environment:
System: System: FreeBSD usbuilder.intra.umessage.com.cn 8.0-RELEASE FreeBSD 8.0-RELEASE #1: Fri Nov 27 12:35:54 CST 2009 root@usbuilder.intra.umessage.com.cn:/usr/obj/usr/src/sys/UMESSAGE amd64
>Description:
If made release on a box behind the firewall or nat gate, pkg_add cdrtools would failed, because of fetching package failed.
Add trying in passive mode after the first trying failed.
>How-To-Repeat:
make release on a box behind firewall
>Fix:
--- release.diff begins here ---
Index: release/powerpc/mkisoimages.sh
===================================================================
--- release/powerpc/mkisoimages.sh (revision 202676)
+++ release/powerpc/mkisoimages.sh (working copy)
@@ -44,9 +44,12 @@
cd /usr/ports/sysutils/cdrtools && make install BATCH=yes && make clean
else
if ! pkg_add -r cdrtools; then
- echo "Could not get it via pkg_add - please go install this"
- echo "from the ports collection and run this script again."
- exit 2
+ export FTP_PASSIVE_MODE=yes
+ if ! pkg_add -r cdrtools; then
+ echo "Could not get it via pkg_add - please go install this"
+ echo "from the ports collection and run this script again."
+ exit 2
+ fi
fi
fi
fi
Index: release/sparc64/mkisoimages.sh
===================================================================
--- release/sparc64/mkisoimages.sh (revision 202676)
+++ release/sparc64/mkisoimages.sh (working copy)
@@ -56,9 +56,12 @@
cd /usr/ports/sysutils/cdrtools && make install BATCH=yes && make clean
else
if ! pkg_add -r cdrtools; then
- echo "Could not get it via pkg_add - please go install this"
- echo "from the ports collection and run this script again."
- exit 2
+ export FTP_PASSIVE_MODE=yes
+ if ! pkg_add -r cdrtools; then
+ echo "Could not get it via pkg_add - please go install this"
+ echo "from the ports collection and run this script again."
+ exit 2
+ fi
fi
fi
fi
Index: release/i386/mkisoimages.sh
===================================================================
--- release/i386/mkisoimages.sh (revision 202676)
+++ release/i386/mkisoimages.sh (working copy)
@@ -47,9 +47,12 @@
cd /usr/ports/sysutils/cdrtools && make install BATCH=yes && make clean
else
if ! pkg_add -r cdrtools; then
- echo "Could not get it via pkg_add - please go install this"
- echo "from the ports collection and run this script again."
- exit 2
+ export FTP_PASSIVE_MODE=yes
+ if ! pkg_add -r cdrtools; then
+ echo "Could not get it via pkg_add - please go install this"
+ echo "from the ports collection and run this script again."
+ exit 2
+ fi
fi
fi
fi
Index: release/ia64/mkisoimages.sh
===================================================================
--- release/ia64/mkisoimages.sh (revision 202676)
+++ release/ia64/mkisoimages.sh (working copy)
@@ -56,8 +56,11 @@
else
echo fetching the package...
if ! pkg_add -r ${MKISOFS_PKG}; then
- echo "error: cannot fetch ${MKISOFS}(8). Bailing out..."
- exit 2
+ export FTP_PASSIVE_MODE=yes
+ if ! pkg_add -r ${MKISOFS_PKG}; then
+ echo "error: cannot fetch ${MKISOFS}(8). Bailing out..."
+ exit 2
+ fi
fi
fi
fi
Index: release/amd64/mkisoimages.sh
===================================================================
--- release/amd64/mkisoimages.sh (revision 202676)
+++ release/amd64/mkisoimages.sh (working copy)
@@ -44,9 +44,12 @@
cd /usr/ports/sysutils/cdrtools && make install BATCH=yes && make clean
else
if ! pkg_add -r cdrtools; then
- echo "Could not get it via pkg_add - please go install this"
- echo "from the ports collection and run this script again."
- exit 2
+ export FTP_PASSIVE_MODE=yes
+ if ! pkg_add -r cdrtools; then
+ echo "Could not get it via pkg_add - please go install this"
+ echo "from the ports collection and run this script again."
+ exit 2
+ fi
fi
fi
fi
--- release.diff ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20100211025523.66300E0477>