summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorerdgeist <erdgeist@erdgeist.org>2006-04-25 00:38:37 +0000
committererdgeist <erdgeist@erdgeist.org>2006-04-25 00:38:37 +0000
commite6cb2196d2342475e30e0ea0b1480025c8668432 (patch)
tree515256dda4364fd61138098ae8444f9b3b80a2e4
parent87273fafa2368e2d1edc91311a888e0385daf9bc (diff)
the ports softlink now is default, since installing the ports tree after splitting the world is default
-rwxr-xr-xezjail-admin18
1 files 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() {
92 # If the default flavour example has not yet been copied, do it now 92 # If the default flavour example has not yet been copied, do it now
93 [ -d ${ezjail_flavours}/default ] || mkdir -p ${ezjail_flavours} && cp -p -R ${ezjail_examples}/default ${ezjail_flavours} 93 [ -d ${ezjail_flavours}/default ] || mkdir -p ${ezjail_flavours} && cp -p -R ${ezjail_examples}/default ${ezjail_flavours}
94 94
95 # no /usr/ports? link to /basejail/usr/ports
96 [ -e ${ezjail_jailtemplate}/usr/ports ] || ln -s /basejail/usr/ports ${ezjail_jailtemplate}/usr/ports
97
95 # A ports collection inside jails is hardly useful w/o an appropriate 98 # A ports collection inside jails is hardly useful w/o an appropriate
96 # /etc/make.conf. If we find basejail/usr/ports/Makefile, assume that 99 # /etc/make.conf.
97 # the admin wants a working make.conf in new jails also a softlink to 100 if [ -f ${ezjail_examples}/default/etc/make.conf -a ! -f ${ezjail_jailtemplate}/etc/make.conf ]; then
98 # the ports in basejail is provided 101 cp -p ${ezjail_examples}/default/etc/make.conf ${ezjail_jailtemplate}/etc/
99 if [ -f ${ezjail_jailbase}/usr/ports/Makefile ]; then 102 echo "Note: a non-standard /etc/make.conf was copied to the template jail in order to get the ports collection running inside jails."
100 # no /usr/ports? link to /basejail/usr/ports
101 [ -e ${ezjail_jailtemplate}/usr/ports ] || ln -s /basejail/usr/ports ${ezjail_jailtemplate}/usr/ports
102
103 if [ -f ${ezjail_examples}/default/etc/make.conf -a ! -f ${ezjail_jailtemplate}/etc/make.conf ]; then
104 cp -p ${ezjail_examples}/default/etc/make.conf ${ezjail_jailtemplate}/etc/
105 echo "Note: a non-standard /etc/make.conf was copied to the template jail in order to get the ports collection running inside jails."
106 fi
107 fi 103 fi
108 104
109 # The ugly perl hack[tm]. Note: we wont do such things for any given 105 # The ugly perl hack[tm]. Note: we wont do such things for any given