From 5ad647ec214e8bab49c42617cdfc4bb4a2dbefb4 Mon Sep 17 00:00:00 2001
From: cryx <cryx@h3q.com>
Date: Thu, 18 Feb 2010 12:22:26 +0000
Subject: Attaching the ZFS-dataset and configuring the CPUset didn't work when
 doing "start" without explicit jailnames. e.g. this happened during normal
 boot.

---
 ezjail.sh | 26 +++++++++++++++-----------
 1 file changed, 15 insertions(+), 11 deletions(-)

diff --git a/ezjail.sh b/ezjail.sh
index b12ed12..a9716e3 100755
--- a/ezjail.sh
+++ b/ezjail.sh
@@ -74,8 +74,6 @@ do_cmd()
     eval ezjail_attachparams=\"\$jail_${ezjail}_attachparams\"
     eval ezjail_attachblocking=\"\$jail_${ezjail}_attachblocking\"
     eval ezjail_forceblocking=\"\$jail_${ezjail}_forceblocking\"
-    eval ezjail_zfs_datasets=\"\$jail_${ezjail}_zfs_datasets\"
-    eval ezjail_cpuset=\"\$jail_${ezjail}_cpuset\"
 
     # Fix backward compatibility issue
     eval ezjail_exec_start=\"\$jail_${ezjail}_exec_start\"
@@ -105,18 +103,24 @@ do_cmd()
   # Pass control to jail script which does the actual work
   [ "${ezjail_pass}" ] && sh /etc/rc.d/jail one${action%crypto} ${ezjail_pass}
 
+  # Configure settings that need to be done after the jail has been started
   if [ "${action}" = "start" ]; then
-    ezjail_safename=`echo -n "${ezjail}" | tr -c '[:alnum:]' _`
-    # Get the JID of the jail
-    [ -f "/var/run/jail_${ezjail_safename}.id" ] && ezjail_id=`cat /var/run/jail_${ezjail_safename}.id` || return
+    for ezjail in ${ezjail_list}; do
+      ezjail_safename=`echo -n "${ezjail}" | tr -c '[:alnum:]' _`
+      # Get the JID of the jail
+      [ -f "/var/run/jail_${ezjail_safename}.id" ] && ezjail_id=`cat /var/run/jail_${ezjail_safename}.id` || return
 
-    # Attach ZFS-datasets to the jail
-    for zfs in ${ezjail_zfs_datasets}; do
-      /sbin/zfs jail ${ezjail_id} ${zfs} || echo -n "Error: ${zfs} could not be configured"
-    done
+      eval ezjail_zfs_datasets=\"\$jail_${ezjail_safename}_zfs_datasets\"
+      eval ezjail_cpuset=\"\$jail_${ezjail_safename}_cpuset\"
+
+      # Attach ZFS-datasets to the jail
+      for zfs in ${ezjail_zfs_datasets}; do
+        /sbin/zfs jail ${ezjail_id} ${zfs} || echo -n "Error: ${zfs} could not be configured"
+      done
 
-    # Configure processor sets for the jail via cpuset(1)
-    [ -z "${ezjail_cpuset}" ] || /usr/bin/cpuset -l ${ezjail_cpuset} -j ${ezjail_id} || echo -n "Error: The defined cpuset is malformed"
+      # Configure processor sets for the jail via cpuset(1)
+      [ -z "${ezjail_cpuset}" ] || /usr/bin/cpuset -l ${ezjail_cpuset} -j ${ezjail_id} || echo -n "Error: The defined cpuset is malformed"
+    done
   fi
 
   # Can only detach after unmounting (from fstab.JAILNAME in /etc/rc.d/jail)
-- 
cgit v1.2.3