summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorerdgeist <erdgeist@erdgeist.org>2010-01-14 02:11:03 +0000
committererdgeist <erdgeist@erdgeist.org>2010-01-14 02:11:03 +0000
commit02b7620839a428c58924153f8f9fab3cb80b486a (patch)
tree266f35c2666a87eb5626d85b1a0ff799f411dccd
parent22aa36af20d28c65abe9c5ef96b45e643c27b19f (diff)
Introduce a default flavour setting, also fix some leftovers from renaming default to example. Many thanks to Panagiotis J. Christias
-rwxr-xr-xMakefile2
-rwxr-xr-xezjail-admin9
-rwxr-xr-xezjail.conf.sample5
-rwxr-xr-xman5/ezjail.conf.55
4 files changed, 16 insertions, 5 deletions
diff --git a/Makefile b/Makefile
index 1ad6144..0b980e9 100755
--- a/Makefile
+++ b/Makefile
@@ -17,4 +17,4 @@ install:
17 sed s:EZJAIL_PREFIX:${PREFIX}: man5/ezjail.5 > ${PREFIX}/man/man5/ezjail.5 17 sed s:EZJAIL_PREFIX:${PREFIX}: man5/ezjail.5 > ${PREFIX}/man/man5/ezjail.5
18 chmod 755 ${PREFIX}/etc/rc.d/ezjail.sh ${PREFIX}/bin/ezjail-admin 18 chmod 755 ${PREFIX}/etc/rc.d/ezjail.sh ${PREFIX}/bin/ezjail-admin
19 chown -R root:wheel ${PREFIX}/man/man1/ezjail-admin.1 ${PREFIX}/man/man5/ezjail.conf.5 ${PREFIX}/man/man5/ezjail.5 ${PREFIX}/share/examples/ezjail/ 19 chown -R root:wheel ${PREFIX}/man/man1/ezjail-admin.1 ${PREFIX}/man/man5/ezjail.conf.5 ${PREFIX}/man/man5/ezjail.5 ${PREFIX}/share/examples/ezjail/
20 chmod 0440 ${PREFIX}/share/examples/ezjail/default/usr/local/etc/sudoers 20 chmod 0440 ${PREFIX}/share/examples/ezjail/example/usr/local/etc/sudoers
diff --git a/ezjail-admin b/ezjail-admin
index 417eb0e..5438a56 100755
--- a/ezjail-admin
+++ b/ezjail-admin
@@ -268,15 +268,15 @@ ezjail_splitworld() {
268 fi 268 fi
269 269
270 # If the default flavour example has not yet been copied, do it now 270 # If the default flavour example has not yet been copied, do it now
271 [ -d "${ezjail_flavours}/default" ] || mkdir -p "${ezjail_flavours}" && cp -p -R "${ezjail_examples}/default" "${ezjail_flavours}" 271 [ -d "${ezjail_flavours}/example" ] || mkdir -p "${ezjail_flavours}" && cp -p -R "${ezjail_examples}/example" "${ezjail_flavours}"
272 272
273 # no /usr/ports? link to /basejail/usr/ports 273 # no /usr/ports? link to /basejail/usr/ports
274 [ -e "${ezjail_jailtemplate}/usr/ports" ] || ln -s /basejail/usr/ports "${ezjail_jailtemplate}/usr/ports" 274 [ -e "${ezjail_jailtemplate}/usr/ports" ] || ln -s /basejail/usr/ports "${ezjail_jailtemplate}/usr/ports"
275 275
276 # A ports collection inside jails is hardly useful w/o an appropriate 276 # A ports collection inside jails is hardly useful w/o an appropriate
277 # /etc/make.conf. 277 # /etc/make.conf.
278 if [ -f "${ezjail_examples}/default/etc/make.conf" -a ! -f "${ezjail_jailtemplate}/etc/make.conf" ]; then 278 if [ -f "${ezjail_examples}/example/etc/make.conf" -a ! -f "${ezjail_jailtemplate}/etc/make.conf" ]; then
279 cp -p "${ezjail_examples}/default/etc/make.conf" "${ezjail_jailtemplate}/etc/" 279 cp -p "${ezjail_examples}/example/etc/make.conf" "${ezjail_jailtemplate}/etc/"
280 echo "Note: a non-standard /etc/make.conf was copied to the template jail in order to get the ports collection running inside jails." 280 echo "Note: a non-standard /etc/make.conf was copied to the template jail in order to get the ports collection running inside jails."
281 fi 281 fi
282 282
@@ -480,6 +480,9 @@ create)
480 [ -e "${ezjail_softlink}" ] && ezjail_softlink=`mktemp -u "${ezjail_softlink}.XXXXXX"` 480 [ -e "${ezjail_softlink}" ] && ezjail_softlink=`mktemp -u "${ezjail_softlink}.XXXXXX"`
481 fi 481 fi
482 482
483 # if no flavour specified on command line, use default flavour
484 : ${ezjail_flavour=${ezjail_default_flavour}}
485
483 # do some sanity checks on the selected flavour (if any) 486 # do some sanity checks on the selected flavour (if any)
484 [ "${ezjail_flavour}" -a ! -d "${ezjail_flavours}/${ezjail_flavour}" ] && exerr "Error: Flavour config directory ${ezjail_flavours}/${ezjail_flavour} not found.\n Refer to ${ezjail_admin}s man page for details on flavours." 487 [ "${ezjail_flavour}" -a ! -d "${ezjail_flavours}/${ezjail_flavour}" ] && exerr "Error: Flavour config directory ${ezjail_flavours}/${ezjail_flavour} not found.\n Refer to ${ezjail_admin}s man page for details on flavours."
485 488
diff --git a/ezjail.conf.sample b/ezjail.conf.sample
index 46c08bc..7aec8d5 100755
--- a/ezjail.conf.sample
+++ b/ezjail.conf.sample
@@ -27,7 +27,10 @@
27# ezjail_ftphost=ftp.freebsd.org 27# ezjail_ftphost=ftp.freebsd.org
28 28
29# This is the command that is being executed by the console subcommand 29# This is the command that is being executed by the console subcommand
30# ezjail_default_execute=/usr/bin/login -f root 30# ezjail_default_execute="/usr/bin/login -f root"
31
32# This is the flavour used by default when setting up a new jail
33# ezjail_default_flavour=""
31 34
32# This is the default location where ezjail archives its jails to 35# This is the default location where ezjail archives its jails to
33# ezjail_archivedir=`pwd -P` 36# ezjail_archivedir=`pwd -P`
diff --git a/man5/ezjail.conf.5 b/man5/ezjail.conf.5
index 259d4ee..36b27c4 100755
--- a/man5/ezjail.conf.5
+++ b/man5/ezjail.conf.5
@@ -112,6 +112,11 @@ for more information).
112Set to YES, if ezjail should provide a soft link from /usr/bin/perl to /usr/local/bin/perl in base jail. 112Set to YES, if ezjail should provide a soft link from /usr/bin/perl to /usr/local/bin/perl in base jail.
113.br 113.br
114.I default: YES 114.I default: YES
115.TP
116.B ezjail_default_flavour (str)
117Controls which flavour should be used for newly created jails.
118.br
119.I default: none
115.SH ZFS OPTIONS 120.SH ZFS OPTIONS
116.TP 121.TP
117.B ezjail_use_zfs (bool) 122.B ezjail_use_zfs (bool)