Changeset 95952b3

Timestamp:

May 3, 2013 10:43:08 AM (3 weeks ago)

Author:

Kris Moore <kris@…>

Branches:

master

Children:

460cf4d

Parents:

fda1ea4

Message:

Welcome the new template system to creating jails!

Now you can create jail templates, and then select which template to use
when you create a new jail. Tested it all the way back to FreeBSD 4.1.1 ;)

Location:

src-sh/warden/scripts/backend

Files:

• createjail.sh (modified) (4 diffs)
• createtemplate.sh (modified) (5 diffs)

src-sh/warden/scripts/backend/createjail.sh

@@ -87 +87 @@
 esac
 
-# Location of the chroot environment
-isDirZFS "${JDIR}"
-if [ $? -eq 0 ] ; then
-  WORLDCHROOT_PLUGINJAIL="${JDIR}/.warden-pj-chroot-${ARCH}"
-  WORLDCHROOT_STANDARD="${JDIR}/.warden-chroot-${ARCH}"
-else
-  WORLDCHROOT_PLUGINJAIL="${JDIR}/.warden-pj-chroot-${ARCH}.tbz"
-  WORLDCHROOT_STANDARD="${JDIR}/.warden-chroot-${ARCH}.tbz"
-fi
-if [ "${PLUGINJAIL}" = "YES" ] ; then
-  WORLDCHROOT="${WORLDCHROOT_PLUGINJAIL}"
-else
-  WORLDCHROOT="${WORLDCHROOT_STANDARD}"
-fi
-export WORLDCHROOT WORLDCHROOT_PLUGINJAIL WORLDCHROOT_STANDARD
+# See if we need to create a default template
+# If using a ARCHIVEFILE we can skip this step
+if [ -z "$TEMPLATE" -a -z "$ARCHIVEFILE" ] ; then
+  DEFTEMPLATE="`uname -r | cut -d '-' -f 1-2`-${ARCH}"
+
+  # If on a plugin jail, lets change the nickname
+  if [ "${PLUGINJAIL}" = "YES"  ] ; then
+    DEFTEMPLATE="${DEFTEMPLATE}-pluginjail"
+  fi
+
+  # See if we need to create a new template for this system
+  isDirZFS "${JDIR}"
+  if [ $? -eq 0 ] ; then
+     TDIR="${JDIR}/.warden-template-$DEFTEMPLATE"
+  else
+     TDIR="${JDIR}/.warden-template-$DEFTEMPLATE.tbz"
+  fi
+  if [ ! -e "$TDIR" ] ; then
+      FLAGS="-arch $ARCH -nick $DEFTEMPLATE"
+
+      uname -r 2>&1 | grep -q "TRUEOS"
+      if [ $? -eq 0 ] ; then
+         FLAGS="-trueos `uname -r | cut -d '-' -f 1-2` $FLAGS" ; export FLAGS
+      else
+         FLAGS="-fbsd `uname -r | cut -d '-' -f 1-2` $FLAGS" ; export FLAGS
+      fi
+
+      if [ "${PLUGINJAIL}" = "YES" ] ; then
+         FLAGS="$FLAGS -pluginjail"
+      fi
+      ${PROGDIR}/scripts/backend/createtemplate.sh ${FLAGS}
+      if [ $? -ne 0 ] ; then
+        exit_err "Failed create default template"
+      fi
+  fi
+  WORLDCHROOT="${TDIR}"
+elif [ -z "$ARCHIVEFILE" ] ; then
+  # Set WORLDCHROOT to the dir we will clone / file to extract
+  WORLDCHROOT="${JDIR}/.warden-template-$TEMPLATE"
+  isDirZFS "${JDIR}"
+  if [ $? -ne 0 ] ; then
+    WORLDCHROOT="${WORLDCHROOT}.tbz"
+  fi
+else 
+   # See if we are overriding the default archive file
+   WORLDCHROOT="$ARCHIVEFILE"
+fi
 
 if [ "${IP4}" != "OFF" ] ; then
@@ -115 +147 @@
   MASK6="${JMASK}"
   if [ -z "$MASK6" ] ; then MASK6="64"; fi
-fi
-
-# See if we are overriding the default archive file
-if [ ! -z "$ARCHIVEFILE" ] ; then
-   WORLDCHROOT="$ARCHIVEFILE"
 fi
 
@@ -156 +183 @@
 done
 : $(( META_ID += 1 ))
-
-# Check if we need to download the chroot file
-
-#
-# If this is a pluginjail, we clone a regular freebsd chroot, then we
-# bootstrap packageng, install the required packages that a pluginjail
-# needs, then snapshot it. Once this is done, creating a pluginjail is
-# as easy as doing a zfs clone.
-#
-if [ "${PLUGINJAIL}" = "YES" -a ! -e "${WORLDCHROOT}" -a -z "$TEMPLATE" ] ; then
-  if [ ! -e "${WORLDCHROOT_STANDARD}" ] ; then
-    downloadchroot "${WORLDCHROOT_STANDARD}"
-  fi
-
-  isDirZFS "${JDIR}"
-  if [ $? -eq 0 ] ; then
-    tank=`getZFSTank "$JDIR"`
-    zfsp=`getZFSRelativePath "${WORLDCHROOT_STANDARD}"`
-    clonep="/$(basename ${WORLDCHROOT_PLUGINJAIL})"
-
-    mnt=`getZFSMountpoint ${tank}`
-    pjdir="${mnt}${clonep}"
-
-    zfs clone ${tank}${zfsp}@clean ${tank}${clonep}
-    if [ $? -ne 0 ] ; then exit_err "Failed creating clean ZFS pluginjail clone"; fi
-
-    cp /etc/resolv.conf ${pjdir}/etc/resolv.conf
-
-    bootstrap_pkgng "${pjdir}" "pluginjail"
-
-    zfs snapshot ${tank}${clonep}@clean
-    if [ $? -ne 0 ] ; then exit_err "Failed creating clean ZFS pluginjail snapshot"; fi
-
-  # We're on UFS :-(
-  else
-    downloadchroot "${WORLDCHROOT_STANDARD}"
-
-  fi
-
-elif [ ! -e "${WORLDCHROOT}" -a "${LINUXJAIL}" != "YES" -a -z "$TEMPLATE" ] ; then
-  downloadchroot "${WORLDCHROOT}"
-fi
 
 # If we are setting up a linux jail, lets do it now
@@ -218 +203 @@
 
 echo "Building new Jail... Please wait..."
-
-# Are we using a jail template to build / clone?
-if [ -n "$TEMPLATE" ] ; then
-   # Reset WORLDCHROOT to the dir we will clone / file to extract
-   WORLDCHROOT="${JDIR}/.warden-template-$TEMPLATE"
-   isDirZFS "${JDIR}"
-   if [ $? -ne 0 ] ; then
-     WORLDCHROOT="${WORLDCHROOT}.tbz"
-   fi
-fi
 
 isDirZFS "${JDIR}"

src-sh/warden/scripts/backend/createtemplate.sh

@@ -100 +100 @@
     fi
 
+    # Creating a plugin jail?
+    if [ "$TPLUGJAIL" = "YES" ] ; then
+      cp /etc/resolv.conf ${TDIR}/etc/resolv.conf
+      bootstrap_pkgng "${TDIR}" "pluginjail"
+    fi
+
     zfs snapshot ${tank}${zfsp}@clean
     if [ $? -ne 0 ] ; then exit_err "Failed creating clean ZFS base snapshot"; fi
@@ -117 +123 @@
       cat ${oldStr}.?? | tar --unlink -xpzf - -C ${JDIR}/.templatedir 2>/dev/null
       cd ${JDIR}
+
+      # Creating a plugin jail?
+      if [ "$TPLUGJAIL" = "YES" ] ; then
+        cp /etc/resolv.conf ${JDIR}/.templatedir/etc/resolv.conf
+        bootstrap_pkgng "${JDIR}/.templatedir/" "pluginjail"
+      fi
+
       echo "Creating template archive..."
       tar cvjf ${TDIR} -C ${JDIR}/.templatedir 2>/dev/null
@@ -133 +146 @@
       done
 
+      # Creating a plugin jail?
+      if [ "$TPLUGJAIL" = "YES" ] ; then
+        cp /etc/resolv.conf ${JDIR}/.templatedir/etc/resolv.conf
+        bootstrap_pkgng "${JDIR}/.templatedir/" "pluginjail"
+      fi
+
       echo "Creating template archive..."
       tar cvjf ${TDIR} -C ${JDIR}/.templatedir 2>/dev/null
@@ -168 +187 @@
            if [ -z "$1" ] ; then exit_err "No nickname specified"; fi
            TNICK="${1}"
+           ;;
+ -pluginjail) shift
+           TPLUGJAIL="YES"
            ;;
         *) exit_err "Invalid option: $1" ;;
@@ -229 +251 @@
 create_template
 
+exit 0