Introduce ugly perl hack.

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"}
 ezjail_flavours=${ezjail_flavours:-"${ezjail_jaildir}/flavours"}
 ezjail_sourcetree=${ezjail_sourcetree:-"/usr/src"}
 ezjail_portscvsroot=${ezjail_portscvsroot:-":pserver:anoncvs@anoncvs.at.FreeBSD.org:/home/ncvs"}
+ezjail_uglyperlhack=${ezjail_uglyperlhack:-"YES"}
 
 ezjail_mount_enable=${ezjail_mount_enable:-"YES"}
 ezjail_devfs_enable=${ezjail_devfs_enable:-"YES"}
@@ -389,6 +390,10 @@ setup|update)
     fi
   fi
 
+  # The ugly perl hack[tm]. Note: we wont do such things for any given
+  # port :(
+  [ "${ezjail_uglyperlhack}" = "YES" -a ! -L ${ezjail_jailbase}/usr/bin/perl ] && ln -s /usr/local/bin/perl ${ezjail_jailbase}/usr/bin/perl
+
   ;;
 *)
   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 @@
 # ezjail_jaildir=/usr/jails
 
 # Location of the tiny skeleton jail template
-# ezjail_jailtemplate=$ezjail_jaildir/newjail
+# ezjail_jailtemplate=${ezjail_jaildir}/newjail
 
 # Location of the huge base jail
-# ezjail_jailbase=$ezjail_jaildir/basejail
+# ezjail_jailbase=${ezjail_jaildir}/basejail
 
 # Location of your copy of FreeBSD's source tree
 # ezjail_sourcetree=/usr/src
@@ -23,6 +23,10 @@
 # a cvsroot near you
 # ezjail_portscvsroot=:pserver:anoncvs@anoncvs.at.FreeBSD.org:/home/ncvs
 
+# base jail will provide a soft link from /usr/bin/perl to /usr/local/bin/perl
+# to accomodate all scripts using '#!/usr/bin/perl'...
+# ezjail_uglyperlhack="YES"
+
 # Default options for newly created jails
 #
 # 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)
 Cvs root to use when checking out or updating the ports tree in base jail
 .br
 .I default: :pserver:anoncvs@anoncvs.at.FreeBSD.org:/home/ncvs
+.TP
+.B ezjail_uglyperlhack (bool)
+Set to YES, if ezjail should provide a soft link from /usr/bin/perl to /usr/local/bin/perl in base jail.
+.br
+.I default: YES
 .SH JAIL CREATION OPTIONS
 Default options for newly created jails. Used by the
 .B ezjail-admin(1)