From e6cb2196d2342475e30e0ea0b1480025c8668432 Mon Sep 17 00:00:00 2001 From: erdgeist Date: Tue, 25 Apr 2006 00:38:37 +0000 Subject: the ports softlink now is default, since installing the ports tree after splitting the world is default --- ezjail-admin | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/ezjail-admin b/ezjail-admin index a898862..51377a0 100755 --- a/ezjail-admin +++ b/ezjail-admin @@ -92,18 +92,14 @@ ezjail_splitworld() { # If the default flavour example has not yet been copied, do it now [ -d ${ezjail_flavours}/default ] || mkdir -p ${ezjail_flavours} && cp -p -R ${ezjail_examples}/default ${ezjail_flavours} + # 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 we find basejail/usr/ports/Makefile, assume that - # the admin wants a working make.conf in new jails also a softlink to - # the ports in basejail is provided - if [ -f ${ezjail_jailbase}/usr/ports/Makefile ]; then - # no /usr/ports? link to /basejail/usr/ports - [ -e ${ezjail_jailtemplate}/usr/ports ] || ln -s /basejail/usr/ports ${ezjail_jailtemplate}/usr/ports - - if [ -f ${ezjail_examples}/default/etc/make.conf -a ! -f ${ezjail_jailtemplate}/etc/make.conf ]; then - cp -p ${ezjail_examples}/default/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 + # /etc/make.conf. + if [ -f ${ezjail_examples}/default/etc/make.conf -a ! -f ${ezjail_jailtemplate}/etc/make.conf ]; then + cp -p ${ezjail_examples}/default/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 -- cgit v1.2.3