summaryrefslogtreecommitdiff
path: root/ezjail.sh
diff options
context:
space:
mode:
authorerdgeist <erdgeist@erdgeist.org>2006-04-15 20:20:12 +0000
committererdgeist <erdgeist@erdgeist.org>2006-04-15 20:20:12 +0000
commitf54c7ed9db3bf333c810930866adab0d04903c2b (patch)
treef82f113d2cae358c24f20662d00b1e3faf293d07 /ezjail.sh
parent2cbc60523afcf69accad29fcfb80ce40f645a8a1 (diff)
HEADS UP:
Major changes in how config is fetched from jail config. A major variable renaming took place. A new subcommand config has been introduced. Jails can be configured not to be run automatically. Crypto images do not work anymore if made with an older version. (Due to config file variable renaming) .norun has been set as standard "do not run" name. However, any . is enough to prevent booting the jail.
Diffstat (limited to 'ezjail.sh')
-rwxr-xr-xezjail.sh6
1 files changed, 3 insertions, 3 deletions
diff --git a/ezjail.sh b/ezjail.sh
index ff072f4..0b1d68f 100755
--- a/ezjail.sh
+++ b/ezjail.sh
@@ -62,13 +62,13 @@ do_cmd()
62 62
63 eval ezjail_root=\"\$jail_${ezjail}_rootdir\" 63 eval ezjail_root=\"\$jail_${ezjail}_rootdir\"
64 eval ezjail_image=\"\$jail_${ezjail}_image\" 64 eval ezjail_image=\"\$jail_${ezjail}_image\"
65 eval ezjail_crypt=\"\$jail_${ezjail}_cryptimage\" 65 eval ezjail_imagetype=\"\$jail_${ezjail}_imagetype\"
66 66
67 # Cannot auto mount crypto jails without interrupting boot process 67 # Cannot auto mount crypto jails without interrupting boot process
68 [ "${ezjail_fromrc}" = "YES" -a "${ezjail_crypt}" = "YES" -a "${action}" = "start" ] && continue 68 [ "${ezjail_fromrc}" = "YES" -a "${ezjail_imagetype}" = "crypto" -a "${action}" = "start" ] && continue
69 69
70 # Explicitely do only run crypto jails when *crypto is requested 70 # Explicitely do only run crypto jails when *crypto is requested
71 [ "${action%crypto}" != "${action}" -a "${ezjail_crypt}" != "YES" ] && continue 71 [ "${action%crypto}" != "${action}" -a "${ezjail_imagetype}" != "crypto" ] && continue
72 72
73 # Try to attach (crypto) devices 73 # Try to attach (crypto) devices
74 [ "${ezjail_image}" ] && attach_detach_pre 74 [ "${ezjail_image}" ] && attach_detach_pre