diff options
-rwxr-xr-x | ezjail-admin | 5 | ||||
-rwxr-xr-x | ezjail.conf.sample | 8 | ||||
-rwxr-xr-x | man5/ezjail.conf.5 | 5 |
3 files changed, 16 insertions, 2 deletions
diff --git a/ezjail-admin b/ezjail-admin index a8f9e81..9a0bbb7 100755 --- a/ezjail-admin +++ b/ezjail-admin | |||
@@ -18,6 +18,7 @@ ezjail_jailfull=${ezjail_jailfull:-"${ezjail_jaildir}/fulljail"} | |||
18 | ezjail_flavours=${ezjail_flavours:-"${ezjail_jaildir}/flavours"} | 18 | ezjail_flavours=${ezjail_flavours:-"${ezjail_jaildir}/flavours"} |
19 | ezjail_sourcetree=${ezjail_sourcetree:-"/usr/src"} | 19 | ezjail_sourcetree=${ezjail_sourcetree:-"/usr/src"} |
20 | ezjail_portscvsroot=${ezjail_portscvsroot:-":pserver:anoncvs@anoncvs.at.FreeBSD.org:/home/ncvs"} | 20 | ezjail_portscvsroot=${ezjail_portscvsroot:-":pserver:anoncvs@anoncvs.at.FreeBSD.org:/home/ncvs"} |
21 | ezjail_uglyperlhack=${ezjail_uglyperlhack:-"YES"} | ||
21 | 22 | ||
22 | ezjail_mount_enable=${ezjail_mount_enable:-"YES"} | 23 | ezjail_mount_enable=${ezjail_mount_enable:-"YES"} |
23 | ezjail_devfs_enable=${ezjail_devfs_enable:-"YES"} | 24 | ezjail_devfs_enable=${ezjail_devfs_enable:-"YES"} |
@@ -389,6 +390,10 @@ setup|update) | |||
389 | fi | 390 | fi |
390 | fi | 391 | fi |
391 | 392 | ||
393 | # The ugly perl hack[tm]. Note: we wont do such things for any given | ||
394 | # port :( | ||
395 | [ "${ezjail_uglyperlhack}" = "YES" -a ! -L ${ezjail_jailbase}/usr/bin/perl ] && ln -s /usr/local/bin/perl ${ezjail_jailbase}/usr/bin/perl | ||
396 | |||
392 | ;; | 397 | ;; |
393 | *) | 398 | *) |
394 | exerr "Usage: `basename -- $0` [create|delete|list|update] {params}" | 399 | exerr "Usage: `basename -- $0` [create|delete|list|update] {params}" |
diff --git a/ezjail.conf.sample b/ezjail.conf.sample index 8824a56..b14dc17 100755 --- a/ezjail.conf.sample +++ b/ezjail.conf.sample | |||
@@ -11,10 +11,10 @@ | |||
11 | # ezjail_jaildir=/usr/jails | 11 | # ezjail_jaildir=/usr/jails |
12 | 12 | ||
13 | # Location of the tiny skeleton jail template | 13 | # Location of the tiny skeleton jail template |
14 | # ezjail_jailtemplate=$ezjail_jaildir/newjail | 14 | # ezjail_jailtemplate=${ezjail_jaildir}/newjail |
15 | 15 | ||
16 | # Location of the huge base jail | 16 | # Location of the huge base jail |
17 | # ezjail_jailbase=$ezjail_jaildir/basejail | 17 | # ezjail_jailbase=${ezjail_jaildir}/basejail |
18 | 18 | ||
19 | # Location of your copy of FreeBSD's source tree | 19 | # Location of your copy of FreeBSD's source tree |
20 | # ezjail_sourcetree=/usr/src | 20 | # ezjail_sourcetree=/usr/src |
@@ -23,6 +23,10 @@ | |||
23 | # a cvsroot near you | 23 | # a cvsroot near you |
24 | # ezjail_portscvsroot=:pserver:anoncvs@anoncvs.at.FreeBSD.org:/home/ncvs | 24 | # ezjail_portscvsroot=:pserver:anoncvs@anoncvs.at.FreeBSD.org:/home/ncvs |
25 | 25 | ||
26 | # base jail will provide a soft link from /usr/bin/perl to /usr/local/bin/perl | ||
27 | # to accomodate all scripts using '#!/usr/bin/perl'... | ||
28 | # ezjail_uglyperlhack="YES" | ||
29 | |||
26 | # Default options for newly created jails | 30 | # Default options for newly created jails |
27 | # | 31 | # |
28 | # Note: Be VERY careful about disabling ezjail_mount_enable. Mounting | 32 | # Note: Be VERY careful about disabling ezjail_mount_enable. Mounting |
diff --git a/man5/ezjail.conf.5 b/man5/ezjail.conf.5 index 4100ea3..2314ec6 100755 --- a/man5/ezjail.conf.5 +++ b/man5/ezjail.conf.5 | |||
@@ -36,6 +36,11 @@ utility for more information) | |||
36 | Cvs root to use when checking out or updating the ports tree in base jail | 36 | Cvs root to use when checking out or updating the ports tree in base jail |
37 | .br | 37 | .br |
38 | .I default: :pserver:anoncvs@anoncvs.at.FreeBSD.org:/home/ncvs | 38 | .I default: :pserver:anoncvs@anoncvs.at.FreeBSD.org:/home/ncvs |
39 | .TP | ||
40 | .B ezjail_uglyperlhack (bool) | ||
41 | Set to YES, if ezjail should provide a soft link from /usr/bin/perl to /usr/local/bin/perl in base jail. | ||
42 | .br | ||
43 | .I default: YES | ||
39 | .SH JAIL CREATION OPTIONS | 44 | .SH JAIL CREATION OPTIONS |
40 | Default options for newly created jails. Used by the | 45 | Default options for newly created jails. Used by the |
41 | .B ezjail-admin(1) | 46 | .B ezjail-admin(1) |