diff options
author | erdgeist <erdgeist@erdgeist.org> | 2010-02-08 03:22:37 +0000 |
---|---|---|
committer | erdgeist <erdgeist@erdgeist.org> | 2010-02-08 03:22:37 +0000 |
commit | 0d48d3af01e07d84f062d9521bd15f30d20890a6 (patch) | |
tree | feb81531ff409ae79756a32a17895de2dfbd66e8 /ezjail-admin | |
parent | ffb9bfcbbd54ce8d6fc44e660b2752ea8debdd00 (diff) |
Revert parts of the changes from 1.243, from now on we install a working make.conf again
Diffstat (limited to 'ezjail-admin')
-rwxr-xr-x | ezjail-admin | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/ezjail-admin b/ezjail-admin index 4a80c45..d5dffc7 100755 --- a/ezjail-admin +++ b/ezjail-admin | |||
@@ -274,6 +274,13 @@ ezjail_splitworld() { | |||
274 | # no /usr/ports? link to /basejail/usr/ports | 274 | # no /usr/ports? link to /basejail/usr/ports |
275 | [ -e "${ezjail_jailtemplate}/usr/ports" ] || ln -s /basejail/usr/ports "${ezjail_jailtemplate}/usr/ports" | 275 | [ -e "${ezjail_jailtemplate}/usr/ports" ] || ln -s /basejail/usr/ports "${ezjail_jailtemplate}/usr/ports" |
276 | 276 | ||
277 | # A ports collection inside jails is hardly useful w/o an appropriate | ||
278 | # /etc/make.conf. | ||
279 | if [ -f "${ezjail_examples}/example/etc/make.conf" -a ! -f "${ezjail_jailtemplate}/etc/make.conf" ]; then | ||
280 | cp -p "${ezjail_examples}/example/etc/make.conf" "${ezjail_jailtemplate}/etc/" | ||
281 | echo "Note: a non-standard /etc/make.conf was copied to the template jail in order to get the ports collection running inside jails." | ||
282 | fi | ||
283 | |||
277 | # The ugly perl hack[tm]. Note: we wont do such things for any given | 284 | # The ugly perl hack[tm]. Note: we wont do such things for any given |
278 | # port :( | 285 | # port :( |
279 | [ "${ezjail_uglyperlhack}" -a ! -L "${ezjail_jailbase}/usr/bin/perl" ] && ln -s /usr/local/bin/perl "${ezjail_jailbase}/usr/bin/perl" | 286 | [ "${ezjail_uglyperlhack}" -a ! -L "${ezjail_jailbase}/usr/bin/perl" ] && ln -s /usr/local/bin/perl "${ezjail_jailbase}/usr/bin/perl" |