From c8fa79d05350732d29ce23fa665d0c121999d7c4 Mon Sep 17 00:00:00 2001
From: Jake Guffey <jake.guffey@eprotex.com>
Date: Thu, 14 Jun 2012 14:33:21 -0400
Subject: [PATCH 1/2] Parameter change

Modified jailbase parameter such that it's only required when $state=present
---
 conf/type/__jail/gencode-local      | 22 ++++++++++++++++++----
 conf/type/__jail/gencode-remote     | 14 +++++++++++++-
 conf/type/__jail/parameter/optional |  1 +
 conf/type/__jail/parameter/required |  1 -
 4 files changed, 32 insertions(+), 6 deletions(-)

diff --git a/conf/type/__jail/gencode-local b/conf/type/__jail/gencode-local
index 6292d943..075a6ef1 100755
--- a/conf/type/__jail/gencode-local
+++ b/conf/type/__jail/gencode-local
@@ -28,12 +28,26 @@ else
    jaildir="/usr/jail"
 fi
 
-jailbase="$(cat "$__object/parameter/jailbase")"
+if [ -f "$__object/parameter/jailbase" ]; then
+   jailbase="$(cat "$__object/parameter/jailbase")"
+else
+   jailbase=""
+fi
+
+state="$(cat "$__object/parameter/state")"
+
+if [ "$state" = "present" ] && [ -z "$jailbase" ]; then
+   exec >&2
+   echo "jailbase is a REQUIRED parameter when state=present!"
+   exit 1
+fi
 
 remotebase="${jaildir}/jailbase.tgz"
 basepresent="$(cat "$__object/explorer/basepresent")"
 
-if [ "$basepresent" = "NONE" ]; then
-    echo "$__remote_copy" "${jailbase}" "$__target_host:${remotebase}"
-fi
+if [ "$state" = "present" ]; then
+   if [ "$basepresent" = "NONE" ]; then
+      echo "$__remote_copy" "${jailbase}" "$__target_host:${remotebase}"
+   fi   # basepresent=NONE
+fi   # state=present
 
diff --git a/conf/type/__jail/gencode-remote b/conf/type/__jail/gencode-remote
index 2db3fac0..d26e02ac 100755
--- a/conf/type/__jail/gencode-remote
+++ b/conf/type/__jail/gencode-remote
@@ -177,6 +177,7 @@ cat <<EOF
    mkdir -p ${jaildir}/${name}
    if [ ! -d "${jaildir}/base" ]; then
       mkdir "${jaildir}/base"
+      chmod 755 "${jaildir}/base"
       tar -xzf "${jaildir}/jailbase.tgz" -C "${jaildir}/base"
       if [ ! -d "${jaildir}/base/usr/local" ]; then
          mkdir -p "${jaildir}/base/usr/local"
@@ -184,6 +185,11 @@ cat <<EOF
       if [ ! -d "${jaildir}/base/usr/home" ]; then
          mkdir -p "${jaildir}/base/usr/home"
       fi
+      if [ ! -d "${jaildir}/home" ]; then
+          SAVE=\$PWD; cd ${jaildir}/base
+          ln -s "home" "usr/home"
+          cd \$SAVE; unset SAVE
+      fi
    fi
    if [ ! -d "${jaildir}/rw" ]; then
       mkdir "${jaildir}/rw"
@@ -198,6 +204,12 @@ cat <<EOF
    if [ -n "\$(ls ${jaildir}/base/var)" ]; then
       cp -r ${jaildir}/base/var/* "${jaildir}/rw/${name}/var/"
    fi
+   chmod 755 "${jaildir}/rw/${name}/var"
+   chmod 755 "${jaildir}/base/var"
+   if [ -n "\$(ls ${jaildir}/base/var/db)" ]; then
+      chmod 755 "${jaildir}/rw/${name}/var/db"
+      chmod 755 "${jaildir}/base/var/db"
+   fi
    mkdir "${jaildir}/rw/${name}/home"
    if [ -n "\$(ls ${jaildir}/base/usr/home)" ]; then
       cp -r ${jaildir}/base/usr/home/* "${jaildir}/rw/${name}/home/"
@@ -293,7 +305,7 @@ if [ "$onboot" = "true" ]; then
    #   if necessary
 
    cat <<EOF
-      jail_list="\$(grep '^jail_list=' /etc/rc.conf | cut -d= -f2)"
+      eval "\$(grep '^jail_list=' /etc/rc.conf)"
       if [ -z "\$jail_list" ]; then	# no jail_list line in rc.conf at all
          echo "jail_list=\"${name}\"" >>/etc/rc.conf
       else
diff --git a/conf/type/__jail/parameter/optional b/conf/type/__jail/parameter/optional
index 53b8895f..1b5f0810 100644
--- a/conf/type/__jail/parameter/optional
+++ b/conf/type/__jail/parameter/optional
@@ -7,3 +7,4 @@ devfs-enable
 devfs-ruleset
 onboot
 jaildir
+jailbase
diff --git a/conf/type/__jail/parameter/required b/conf/type/__jail/parameter/required
index 29797ee6..ff72b5c7 100644
--- a/conf/type/__jail/parameter/required
+++ b/conf/type/__jail/parameter/required
@@ -1,2 +1 @@
 state
-jailbase

From d0b96e22d4113ec47e377ffae21d575022c5799f Mon Sep 17 00:00:00 2001
From: Jake Guffey <jake.guffey@eprotex.com>
Date: Thu, 14 Jun 2012 14:40:40 -0400
Subject: [PATCH 2/2] Fix typo

symlink was backwards
---
 conf/type/__jail/gencode-remote | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/conf/type/__jail/gencode-remote b/conf/type/__jail/gencode-remote
index d26e02ac..62aa7b60 100755
--- a/conf/type/__jail/gencode-remote
+++ b/conf/type/__jail/gencode-remote
@@ -187,7 +187,7 @@ cat <<EOF
       fi
       if [ ! -d "${jaildir}/home" ]; then
           SAVE=\$PWD; cd ${jaildir}/base
-          ln -s "home" "usr/home"
+          ln -s usr/home home
           cd \$SAVE; unset SAVE
       fi
    fi