the ports softlink now is default, since installing the ports tree after splitting the world is default
This commit is contained in:
parent
87273fafa2
commit
e6cb2196d2
18
ezjail-admin
18
ezjail-admin
@ -92,18 +92,14 @@ ezjail_splitworld() {
|
|||||||
# If the default flavour example has not yet been copied, do it now
|
# 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}
|
[ -d ${ezjail_flavours}/default ] || mkdir -p ${ezjail_flavours} && cp -p -R ${ezjail_examples}/default ${ezjail_flavours}
|
||||||
|
|
||||||
# A ports collection inside jails is hardly useful w/o an appropriate
|
# no /usr/ports? link to /basejail/usr/ports
|
||||||
# /etc/make.conf. If we find basejail/usr/ports/Makefile, assume that
|
[ -e ${ezjail_jailtemplate}/usr/ports ] || ln -s /basejail/usr/ports ${ezjail_jailtemplate}/usr/ports
|
||||||
# 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
|
# A ports collection inside jails is hardly useful w/o an appropriate
|
||||||
cp -p ${ezjail_examples}/default/etc/make.conf ${ezjail_jailtemplate}/etc/
|
# /etc/make.conf.
|
||||||
echo "Note: a non-standard /etc/make.conf was copied to the template jail in order to get the ports collection running inside jails."
|
if [ -f ${ezjail_examples}/default/etc/make.conf -a ! -f ${ezjail_jailtemplate}/etc/make.conf ]; then
|
||||||
fi
|
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
|
fi
|
||||||
|
|
||||||
# The ugly perl hack[tm]. Note: we wont do such things for any given
|
# The ugly perl hack[tm]. Note: we wont do such things for any given
|
||||||
|
Loading…
x
Reference in New Issue
Block a user