From 0d48d3af01e07d84f062d9521bd15f30d20890a6 Mon Sep 17 00:00:00 2001 From: erdgeist Date: Mon, 8 Feb 2010 03:22:37 +0000 Subject: Revert parts of the changes from 1.243, from now on we install a working make.conf again --- ezjail-admin | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'ezjail-admin') diff --git a/ezjail-admin b/ezjail-admin index 4a80c45..d5dffc7 100755 --- a/ezjail-admin +++ b/ezjail-admin @@ -274,6 +274,13 @@ ezjail_splitworld() { # no /usr/ports? link to /basejail/usr/ports [ -e "${ezjail_jailtemplate}/usr/ports" ] || ln -s /basejail/usr/ports "${ezjail_jailtemplate}/usr/ports" + # A ports collection inside jails is hardly useful w/o an appropriate + # /etc/make.conf. + if [ -f "${ezjail_examples}/example/etc/make.conf" -a ! -f "${ezjail_jailtemplate}/etc/make.conf" ]; then + cp -p "${ezjail_examples}/example/etc/make.conf" "${ezjail_jailtemplate}/etc/" + echo "Note: a non-standard /etc/make.conf was copied to the template jail in order to get the ports collection running inside jails." + fi + # The ugly perl hack[tm]. Note: we wont do such things for any given # port :( [ "${ezjail_uglyperlhack}" -a ! -L "${ezjail_jailbase}/usr/bin/perl" ] && ln -s /usr/local/bin/perl "${ezjail_jailbase}/usr/bin/perl" -- cgit v1.2.3