17 changed files with 512 additions and 1078 deletions
--- a/README.md
+++ b/README.md
@ -8,30 +8,31 @@ Gocage can handle multiple datastores, so you can have jails on HDD storage and
 From v0.33b, due to multi ZFS pool support, gocage is no longer 100% compatible with iocage.  
 Zfs datasets now should be specified with the ZFS pool. e.g. :  
-<pre><code>Config.Jail_zfs = 1
+<code>
 Config.Jail_zfs = 1
 Config.Jail_zfs_dataset = myzfspool/poudriere
 Config.Jail_zfs_mountpoint = none
-</code></pre>
+</code>
 Create jails
 ------------
-You need to specify release, and optional configuration:  
+For now, we can't pass config at creation time. We have to define config after creation:  
-<pre><code>gocage create jail1 -r 13.2-RELEASE -p "Config.Ip4_addr='vnet0|192.168.1.91/24',Config.Ip6=none,Config.Boot=1"
+<pre><code>
-</code></pre>
+gocage create jail1 -r 13.2-RELEASE
-
+gocage set Config.Ip4_addr="vnet0|192.168.1.91/24" Config.Vnet=1 jail1
 Create basejail. A basejail is a jail based on a release: system will be nullfs read-only mounted from the release directory. Main advantage is that release updates will immediately apply to jails based on this release. Another advantage is that jail system is mounted read-only, a plus from a security perspective:  
 <pre><code>gocage create -b -r 14.0-RELEASE basejail1
 </code></pre>
 List jails
 ----------
-<pre><code>gocage list</code></pre>
+Nothing fancy, just use  
 `gocage list`
 ### Specify fields to display
 Use -o to specify which fields you want to display:  
-<pre><code>gocage list -o JID,Name,Running,Config.Boot,Config.Comment  
+<pre><code>
 gocage list -o JID,Name,Running,Config.Boot,Config.Comment  
 +=====+==========+=========+=============+================+  
 | JID | Name     | Running | Config.Boot | Config.Comment |  
 +=====+==========+=========+=============+================+  
@ -45,7 +46,7 @@ Use -o to specify which fields you want to display:
 +-----+----------+---------+-------------+----------------+  
 </code></pre>
-Use `gocage properties`to list available fields.
+See [cmd/struct.go](https://git.nosd.in/yo/gocage/src/branch/master/cmd/struct.go) for field names.
 Filter jails  
@ -53,7 +54,8 @@ Filter jails
 ### By name
 Just add name on gocage list command :  
-<pre><code>gocage list srv-bdd srv-web
+<pre><code>
 gocage list srv-bdd srv-web
 +=====+=========+=================+=======================+=========+
 | JID | Name    | Config.Release  | Config.Ip4_addr       | Running |
 +=====+=========+=================+=======================+=========+
@ -61,11 +63,12 @@ Just add name on gocage list command :
 +-----+---------+-----------------+-----------------------+---------+
 | 41  | srv-web | 13.0-RELEASE-p4 | vnet0|192.168.1.26/24 | true    |
 +-----+---------+-----------------+-----------------------+---------+
-</code></pre>
+</pre></code>
 ### By field value
 You can filter jails with -f option, followed by key=value. Suppose you want to see only active at boot jails:  
-<pre><code>gocage list -f Config.Boot=1 -o JID,Name,Running,Config.Boot,Config.Comment
+<pre><code>
 gocage list -f Config.Boot=1 -o JID,Name,Running,Config.Boot,Config.Comment
 +=====+==========+=========+=============+================+
 | JID | Name     | Running | Config.Boot | Config.Comment |
 +=====+==========+=========+=============+================+
@ -77,10 +80,11 @@ You can filter jails with -f option, followed by key=value. Suppose you want to
 +-----+----------+---------+-------------+----------------+
 | 22  | srv-dns1 | true    | 1           |                |
 +-----+----------+---------+-------------+----------------+
-</code></pre>
+</pre></code>
 Now, only active at boot and running :  
-<pre><code>gocage list -f Config.Boot=1,Running=true -o JID,Name,Running,Config.Boot
+<pre><code>
 gocage list -f Config.Boot=1,Running=true -o JID,Name,Running,Config.Boot
 +=====+==========+=========+=============+
 | JID | Name     | Running | Config.Boot |
 +=====+==========+=========+=============+
@ -90,12 +94,13 @@ Now, only active at boot and running :
 +-----+----------+---------+-------------+
 | 22  | srv-dns1 | true    | 1           |
 +-----+----------+---------+-------------+
-</code></pre>
+</pre></code>
 Sort jails  
 ----------
 Use -s switch followed by sort criteria. Criteria is a field name, prefixed with + or - for sort order (increase/decrease):  
-<pre><code>gocage list -f Config.Boot=1,Running=true -o JID,Name,Running,Config.Boot -s +JID
+<pre><code>
 gocage list -f Config.Boot=1,Running=true -o JID,Name,Running,Config.Boot -s +JID
 +=====+==========+=========+=============+
 | JID | Name     | Running | Config.Boot |
 +=====+==========+=========+=============+
@ -105,11 +110,12 @@ Use -s switch followed by sort criteria. Criteria is a field name, prefixed with
 +-----+----------+---------+-------------+
 | 183 | test     | true    | 1           |
 +-----+----------+---------+-------------+
-</code></pre>
+</pre></code>
 You can use up to 3 criteria, delimited with comma.  
 As an example, you want to list boot priorities of automatically starting jails:  
-<pre><code>gocage list -o JID,Name,Config.Ip4_addr,Config.Priority,Config.Boot,Running -s -Config.Priority,-Config.Boot -f Running=true
+<pre><code>
 gocage list -o JID,Name,Config.Ip4_addr,Config.Priority,Config.Boot,Running -s -Config.Priority,-Config.Boot -f Running=true
 +=====+==============+=======================+=================+=============+=========+
 | JID | Name         | Config.Ip4_addr       | Config.Priority | Config.Boot | Running |
 +=====+==============+=======================+=================+=============+=========+
@ -121,62 +127,47 @@ As an example, you want to list boot priorities of automatically starting jails:
 +-----+--------------+-----------------------+-----------------+-------------+---------+
 | 4   | coincoin     | vnet0|192.168.1.9/24  | 20              | 0           | true    |
 +-----+--------------+-----------------------+-----------------+-------------+---------+
-</code></pre>
+</pre></code>
 Stop jails  
 ----------
-<pre><code>gocage stop test</code></pre>
+`gocage stop test`
 Update jails  
 ----------
 To update jail patch version, use gocage update :  
-<pre><code>gocage update test</code></pre>
+`gocage update test`
 Update basejails/releases  
 ----------
 To update basejails, you need to update the release they are based on. Specify release with -r, and the datastore storing concerned release with -d :  
 <pre><code>gocage update -d fastgocage -r 14.1-RELEASE</code></pre>
 Upgrade jails  
 ----------
 To upgrade jail to newer release, use gocage upgrade :  
-<pre><code>gocage upgrade -r 13.2-RELEASE test</code></pre>
+`gocage upgrade -r 13.2-RELEASE test`
-A pre-upgrade snapshot wil be made so you can rollback if needed.  
+A pre-upgrade snapshot wil be made so we can rollback if needed.  
 Upgrading basejail/release
 ----------
 Upgrading basejails currently needs to be done manually, for each jail.  
 The idea is to stop the jail, change the content of its fstab file to point to the new release, then start jail.  
 If one change the fstab while the jail is running, its system directories won't be unmounted at stop time and this will provoke stop errors.  
 To minimize downtime, the change could be scripted:  
 <pre><code>gocage stop jail1
 sed -i .bak 's/14.0-RELEASE/14.1-RELEASE/' /iocage/jails/jail1/fstab
 # Avoid race-condition by waiting for the update in fstab
 until grep -q 14.1-RELEASE /iocage/jails/jail1/fstab; do sleep 0.2; done
 gocage start jail1
 </code></pre>
 You can now update ports.
 Delete jails  
 ----------
-<pre><code>gocage destroy test</code></pre>
+`gocage destroy test`
 Multi datastore  
 ----------
 A datastore is a ZFS dataset mounted. It should be declared in gocage.conf.yml, specifying its ZFS mountpoint :
-<pre><code>datastore:
+<pre><code>
 datastore:
  - /iocage
  - /fastiocage
-</code></pre>
+</pre></code>
 In gocage commands, datastore name is the mountpoint without its "/" prefix.  
 ### List datastores
-<pre><code>gocage datastore list 
+<pre><code>
 gocage datastore list 
 +============+=============+============+===========+==========+============+
 | Name       | Mountpoint  | ZFSDataset | Available | Used     | Referenced |
 +============+=============+============+===========+==========+============+
@ -184,21 +175,23 @@ In gocage commands, datastore name is the mountpoint without its "/" prefix.
 +------------+-------------+------------+-----------+----------+------------+
 | fastiocage | /fastiocage | ssd/iocage | 1.5 TB    | 65.3 KB  | 34.6 KB    |
 +------------+-------------+------------+-----------+----------+------------+
-</code></pre>
+</pre></code>
 ### Filter datastores  
 As with jails and snapshots, you can filter by name:  
-<pre><code>gocage datastore list iocage
+<pre><code>
 gocage datastore list iocage
 +============+=============+============+===========+==========+============+
 | Name       | Mountpoint  | ZFSDataset | Available | Used     | Referenced |
 +============+=============+============+===========+==========+============+
 | iocage     | /iocage     | hdd/iocage | 1.6 TB    | 414.9 GB | 27.5 KB    |
 +------------+-------------+------------+-----------+----------+------------+
-</code></pre>
+</pre></code>
 ### Sort datastores  
 You can sort datastores:  
-<pre><code>gocage datastore list -s -Available
+<pre><code>
 gocage datastore list -s -Available
 +============+=============+============+===========+==========+============+
 | Name       | Mountpoint  | ZFSDataset | Available | Used     | Referenced |
 +============+=============+============+===========+==========+============+
@ -206,9 +199,9 @@ You can sort datastores:
 +------------+-------------+------------+-----------+----------+------------+
 | fastiocage | /fastiocage | ssd/iocage | 1.5 TB    | 65.3 KB  | 34.6 KB    |
 +------------+-------------+------------+-----------+----------+------------+
-</code></pre>
+</pre></code>
-Use `gocage properties`to list available fields.
+See [cmd/struct.go](https://git.nosd.in/yo/gocage/src/branch/master/cmd/struct.go) for field names.
 Migrating jails  
 ----------
@ -221,23 +214,26 @@ Be aware the moment you migrate a jail to another datastore than /iocage default
 Then you need to disable iocage service, and enable gocage so the jails will start automatically at boot.  
 Also make sure, if you don't destroy source jail, that it won't have the "boot" property set or you will have the 2 jails up at boot.  
-<pre><code>gocage migrate -d fastiocage srv-random
+<pre><code>
 gocage migrate -d fastiocage srv-random
 Snapshot data/iocage/jails/srv-random: Done
 Snapshot data/iocage/jails/srv-random/root: Done
 Migrate jail config dataset to fastdata/iocage/jails/srv-random: Done
 Migrate jail filesystem dataset to fastdata/iocage/jails/srv-random/root: Done
-</code></pre>
+</pre></code>
 Fetch  
 ----------
 Files can be fetched from custom repository, or from local directory with "from" option.  
 For example if you destroyed releases/12.3-RELEASE and still have the downloaded files in /iocage/download/12.3-RELEASE:  
-<pre><code>gocage fetch -r 12.3 -d iocage -f file:/iocage/download
+<pre><code>
-</code></pre>
+gocage fetch -r 12.3 -o iocage --from file:/iocage/download
 </pre></code>
 TODO
 ----------
 gocage create from templates  
-
+gocage init  
  create default pool with defaults.json  
--- a/TODO.md
+++ b/TODO.md
@ -1,19 +1,8 @@
 Replicating jails between two servers (use zrepl)
 Manage remote jails :
  - Make gocage a service
  - All commands should become API endpoint
  - How to handle authentication ?
 DEBUG: 
 - cmd/list.go:275:
    // FIXME ??? Shouldn't be ioc-$Name ?
    j.InternalName = rj.Name
 - WriteConfigToDisk don't write neither "release" in cmd stop neither "last_started" in cmd start
  26/08/2023 : Last_started is updated
 BUGS:
 - unable to set values containing equal sign :
  # gocage set Config.Exec_poststart="jail -m allow.mount.linprocfs=1 name=ioc-poudriere-noo" poudriere-noo
  Error parsing args: Config.Exec_poststart=jail -m allow.mount.linprocfs=1 name=ioc-poudriere-noo
 - Fix fstab when migrating jail  
--- a/cmd/console.go
+++ b/cmd/console.go
@ -12,7 +12,7 @@ import (
 func ShellJail(args []string) error {
 	// We cant shell more than one jail bc we replace gocage execution with jexec, so there wont be no return to gocage
 	if len(args) > 0 {
-		cj, err := getJailFromArray(args[0], []string{"basejail", "jail"}, gJails)
+		cj, err := getJailFromArray(args[0], []string{"jail"}, gJails)
 		if err != nil {
 			fmt.Printf("Error getting jail %s: %v\n", args[0], err)
 			return err
--- a/cmd/create.go
+++ b/cmd/create.go
@ -5,9 +5,7 @@ import (
 	"fmt"
 	//"log"
 	"time"
 	"errors"
 	"strings"
 	cp "github.com/otiai10/copy"
 	log "github.com/sirupsen/logrus"
 )
@ -16,11 +14,6 @@ func CreateJail(args []string) {
 	var err error
 	var jtype []string
 	if gCreateArgs.BaseJail && gCreateArgs.Release == "" {
 		fmt.Println("Release should be set when creating basejail")
 		os.Exit(1)
 	}
 	if len(gCreateArgs.JailType) > 0 {
 		jtype = []string{gCreateArgs.JailType}
 	}
@ -44,7 +37,7 @@ func CreateJail(args []string) {
 		var ds *Datastore
 		if len(gCreateArgs.Datastore) > 0 {
-			log.Debugf("Use %s datastore\n", gCreateArgs.Datastore)
+			fmt.Printf("DEBUG: Use %s datastore\n", gCreateArgs.Datastore)
 			ds, err = getDatastoreFromArray(gCreateArgs.Datastore, gDatastores)
 			if err != nil {
 				fmt.Printf("ERROR Getting datastore: %s\n", gCreateArgs.Datastore, err.Error())
@ -53,131 +46,38 @@ func CreateJail(args []string) {
 		} else {
 			ds = &gDatastores[0]
 		}
 		/*
 		// Create and populate datasets
 		err = zfsCreateDataset(fmt.Sprintf("%s/jails/%s", ds.ZFSDataset, jname), fmt.Sprintf("%s/jails/%s", ds.Mountpoint, jname), "lz4")
 		if err != nil {
 			fmt.Printf("ERROR: %s\n", err.Error())
 			return
 		}
 		err = zfsCreateDataset(fmt.Sprintf("%s/jails/%s/root", ds.ZFSDataset, jname), fmt.Sprintf("%s/jails/%s/root", ds.Mountpoint, jname), "lz4")
 		if err != nil {
 			fmt.Printf("ERROR: %s\n", err.Error())
 			return
 		}
 		*/
 		// Get base template if specified
-		if gCreateArgs.BaseJail {
+		if len(gCreateArgs.BaseTemplate) > 0 {
-			/**************************************************************************
+			log.Debugf("Jail will be created from a base template\n")
-			*  Create based jail from a template
+			/*bj, err := getJailFromArray(jname, []string{"template"}, gJails)
 			*/
 			log.Debugf("Jail will be created read-only from release %s\n", gCreateArgs.Release)
 			// First check if we got release on the same datastore
 			releasePath := fmt.Sprintf("%s/releases/%s/root", ds.Mountpoint, gCreateArgs.Release)
 			_, err := os.Stat(releasePath)
 			if os.IsNotExist(err) {
 				fmt.Printf("ERROR: Release locally not available. Run \"gocage fetch\"\n")
 				return
 			}
 			// Create jail datasets
 			dstDset := fmt.Sprintf("%s/jails/%s", ds.ZFSDataset, jname)
 			fmt.Printf("    > Initialize dataset %s\n", dstDset)
 			err = zfsCreateDataset(dstDset, "", "")
 			if err != nil {
-				fmt.Printf("ERROR creating dataset %s: %s\n", dstDset, err.Error())
+				if strings.EqualFold(err.Error(), "Jail not found") {
-				return
+					
-			}
+				} else {
-			// Create jail root datasets
+					fmt.Printf("ERROR: %s\n", err.Error())
 			dstRootDset := fmt.Sprintf("%s/jails/%s/root", ds.ZFSDataset, jname)
 			fmt.Printf("    > Initialize dataset %s\n", dstRootDset)
 			err = zfsCreateDataset(dstRootDset, "", "")
 			if err != nil {
 				fmt.Printf("ERROR creating dataset %s: %s\n", dstRootDset, err.Error())
 				return
 			}
 			// Create needed directories with basejail permissions
 			fmt.Printf("    > Create base read-only directories\n")
 			dstRootDir := fmt.Sprintf("%s/jails/%s/root", ds.Mountpoint, jname)
 			for _, d := range append(gBaseDirs, gEmptyDirs...) {
 				dstPath := dstRootDir
 				srcPath := releasePath
 				for _, cd := range strings.Split(d, "/") {
 					srcPath = fmt.Sprintf("%s/%s", srcPath, cd)
 					dstPath = fmt.Sprintf("%s/%s", dstPath, cd)
 					_, err := os.Stat(dstPath)
 					if errors.Is(err, os.ErrNotExist) {
 						srcPerm, err := getPermissions(srcPath)
 						if err != nil {
 							fmt.Printf("ERROR getting permissions of %s: %s\n", srcPath, err.Error())
 							return
 						}
 						err = os.Mkdir(dstPath, srcPerm.Mode().Perm())
 						if err != nil {
 							fmt.Printf("ERROR creating directory %s: %s\n", dstPath, err.Error())
 							return
 						}
 					}
 				}
 			}
 			// Copy these from basejail
 			fmt.Printf("    > Create base writable directories\n")
 			for _, d := range gCopyDirs {
 				err := cp.Copy(fmt.Sprintf("%s/%s", releasePath, d), fmt.Sprintf("%s/%s", dstRootDir, d))
 				if err != nil {
 					fmt.Printf("ERROR copying %s to %s: %s\n", fmt.Sprintf("%s/%s", releasePath, d),
 						   fmt.Sprintf("%s/%s", dstRootDir, d), err.Error())
 					return
 				}
-			}
+			} else {
-
+				fmt.Printf("Jail exist: %s\n", jname)
-			///////////////////////////////////////////////////////////////////////
+				continue
-			// Copy defaults.json...
+			}*/
 			jailConfPath := fmt.Sprintf("%s/jails/%s/config.json", ds.Mountpoint, jname)
 			err = copyFile(fmt.Sprintf("%s/defaults.json", ds.Mountpoint),
 				       jailConfPath)
 			if err != nil {
 				fmt.Printf("ERROR creating config.json: %s\n", err.Error())
 				return
 			}
 			///////////////////////////////////////////////////////////////////////
 			// ... and update it
 			jailConf, err := getJailConfig(jailConfPath)
 			if err != nil {
 				log.Println("ERROR reading jail config from %s", jailConfPath)
 			}
 			// Build jail object from config
 			jailRootPath := fmt.Sprintf("%s/jails/%s/%s", ds.Mountpoint, jname, "root")
 			j := Jail{
 				Name:       jailConf.Host_hostuuid,
 				Config:     jailConf,
 				ConfigPath: jailConfPath,
 				Datastore:  ds.Name,
 				RootPath:   jailRootPath,
 				Running:    false,
 			}
 			// We need to store the basejail template. We could :
 			// 1. Use "origin" ?
 			// 2. Add a json item to config ("basejail_template" p.e.), but iocage would delete it once jail is started from iocage
 			// 3. Add a gocage specific config ("config.gocage.json" p.e.)
 			j.Config.Jailtype = "basejail"
 			j.Config.Origin = gCreateArgs.Release
 			j.Config.Host_hostname = jname
 			j.Config.Host_hostuuid = jname
 			j.WriteConfigToDisk(false)
 			///////////////////////////////////////////////////////////////////////
 			// Create fstab
 			fstabHandle, err := os.Create(fmt.Sprintf("%s/jails/%s/fstab", ds.Mountpoint, jname))
 			if err != nil {
 				fmt.Printf("ERROR creating fstab: %s", err.Error())
 				return
 			}
 			defer fstabHandle.Close()
 			for _, d := range gBaseDirs {
 				fmt.Fprintf(fstabHandle, "%s\t%s\tnullfs\tro\t0\t0\n", fmt.Sprintf("%s/%s", releasePath, d), fmt.Sprintf("%s/%s", dstRootDir, d))
 			}
 			fmt.Printf("  > Jail created!\n")
 		} else {
-			/**************************************************************************
+			// Normal jail with its own freebsd base
 			 *  Create normal jail with its own freebsd base
 			 */
 			log.Debugf("Creating jail with its own freebsd base\n")
 			// First check if we got release on the same datastore
@ -186,9 +86,10 @@ func CreateJail(args []string) {
 				fmt.Printf("ERROR: Release locally not available. Run \"gocage fetch\"\n")
 				return
 			}
-
+			
 			///////////////////////////////////////////////////////////////////////
-			// Create and populate jail filesystem from release
+			//
 			// Create and populate jail filesystem
 			dstDset := fmt.Sprintf("%s/jails/%s", ds.ZFSDataset, jname)
 			fmt.Printf("    > Initialize dataset %s\n", dstDset)
 			sNow := time.Now().Format("20060102150405")
@ -241,7 +142,10 @@ func CreateJail(args []string) {
 				return
 			}
 			fmt.Printf("Jail filesystem successfuly initalized\n")
 			///////////////////////////////////////////////////////////////////////
 			//
 			// Copy defaults.json...
 			jailConfPath := fmt.Sprintf("%s/jails/%s/config.json", ds.Mountpoint, jname)
 			err = copyFile(fmt.Sprintf("%s/defaults.json", ds.Mountpoint), 
@ -251,13 +155,15 @@ func CreateJail(args []string) {
 				return
 			}
 			///////////////////////////////////////////////////////////////////////
 			//
 			// ... and update it
 			// Get conf from config.json
 			jailConf, err := getJailConfig(jailConfPath)
 			if err != nil {
 				log.Println("ERROR reading jail config from %s", jailConfPath)
 			}
-
+			
-			// Build jail object from config
+			// 2. Build jail object from config
 			jailRootPath := fmt.Sprintf("%s/jails/%s/%s", ds.Mountpoint, jname, "root")
 			j := Jail{
 				Name:       jailConf.Host_hostuuid,
@ -267,14 +173,15 @@ func CreateJail(args []string) {
 				RootPath:   jailRootPath,
 				Running:    false,
 			}
-
+			
 			j.Config.Release = gCreateArgs.Release
 			j.Config.Host_hostname = jname
 			j.Config.Host_hostuuid = jname
-			j.Config.Jailtype = "jail"
+						
 			j.WriteConfigToDisk(false)
 			///////////////////////////////////////////////////////////////////////
 			//
 			// Create fstab
 			fstabHandle, err := os.Create(fmt.Sprintf("%s/jails/%s/fstab", ds.Mountpoint, jname))
 			if err != nil {
@ -282,19 +189,8 @@ func CreateJail(args []string) {
 				return
 			}
 			defer fstabHandle.Close()
 			fmt.Printf("  > Jail created!\n")
 		}
-
+		
-		var cmdline []string
+		// TODO : Set JailType
 		for _, props := range strings.Split(gCreateArgs.Properties, ",") {
 			cmdline = append(cmdline, props)
 		}
 		// Reload jail list so SetJailProperties will see it
 		ListJails(nil, false)
 		cmdline = append(cmdline, jname)
 		log.Debugf("cmdline: \"%v\"", cmdline)
 		SetJailProperties(cmdline)
 	}
 }
--- a/cmd/freebsd-update.conf.go
+++ b/cmd/freebsd-update.conf.go
@ -0,0 +1,85 @@
 package cmd
 const (
 	fbsdUpdateConfig = `
 	# $FreeBSD$
 	# Trusted keyprint.  Changing this is a Bad Idea unless you've received
 	# a PGP-signed email from <security-officer@FreeBSD.org> telling you to
 	# change it and explaining why.
 	KeyPrint 800651ef4b4c71c27e60786d7b487188970f4b4169cc055784e21eb71d410cc5
 	# Server or server pool from which to fetch updates.  You can change
 	# this to point at a specific server if you want, but in most cases
 	# using a "nearby" server won't provide a measurable improvement in
 	# performance.
 	ServerName update.FreeBSD.org
 	# Components of the base system which should be kept updated.
 	Components world
 	# Example for updating the userland and the kernel source code only:
 	# Components src/base src/sys world
 	# Paths which start with anything matching an entry in an IgnorePaths
 	# statement will be ignored.
 	IgnorePaths
 	# Paths which start with anything matching an entry in an IDSIgnorePaths
 	# statement will be ignored by "freebsd-update IDS".
 	IDSIgnorePaths /usr/share/man/cat
 	IDSIgnorePaths /usr/share/man/whatis
 	IDSIgnorePaths /var/db/locate.database
 	IDSIgnorePaths /var/log
 	# Paths which start with anything matching an entry in an UpdateIfUnmodified
 	# statement will only be updated if the contents of the file have not been
 	# modified by the user (unless changes are merged; see below).
 	UpdateIfUnmodified /etc/ /var/ /root/ /.cshrc /.profile
 	# When upgrading to a new FreeBSD release, files which match MergeChanges
 	# will have any local changes merged into the version from the new release.
 	MergeChanges /etc/
 	### Default configuration options:
 	# Directory in which to store downloaded updates and temporary
 	# files used by FreeBSD Update.
 	WorkDir /iocage/freebsd-update
 	# Destination to send output of "freebsd-update cron" if an error
 	# occurs or updates have been downloaded.
 	# MailTo root
 	# Is FreeBSD Update allowed to create new files?
 	# AllowAdd yes
 	# Is FreeBSD Update allowed to delete files?
 	# AllowDelete yes
 	# If the user has modified file ownership, permissions, or flags, should
 	# FreeBSD Update retain this modified metadata when installing a new version
 	# of that file?
 	# KeepModifiedMetadata yes
 	# When upgrading between releases, should the list of Components be
 	# read strictly (StrictComponents yes) or merely as a list of components
 	# which *might* be installed of which FreeBSD Update should figure out
 	# which actually are installed and upgrade those (StrictComponents no)?
 	StrictComponents yes
 	# When installing a new kernel perform a backup of the old one first
 	# so it is possible to boot the old kernel in case of problems.
 	BackupKernel no
 	# If BackupKernel is enabled, the backup kernel is saved to this
 	# directory.
 	# BackupKernelDir /boot/kernel.old
 	# When backing up a kernel also back up debug symbol files?
 	BackupKernelSymbolFiles no
 	# Create a new boot environment when installing patches
 	CreateBootEnv no
 	`
 ) 
--- a/cmd/init.go
+++ b/cmd/init.go
@ -1,153 +0,0 @@
 package cmd
 import (
 	"os"
 	"fmt"
 	"strings"
 	"github.com/spf13/viper"
 	log "github.com/sirupsen/logrus"
 )
 /********************************************************************************
 * Initialize datastore(s) /iocage, /iocage/jails
 * Put defaults.json,
 * Update it with hostid, interfaces, and maybe other necessary fields
 * Initialize bridge
 *******************************************************************************/
 func InitGoCage(args []string) {
 	// Create datastores
 	for _, dstore := range viper.GetStringSlice("datastore") {
 		log.Debugf("Ranging over %v\n", dstore)
 		dset, err := zfsGetDatasetByMountpoint(dstore)
 		if err != nil && strings.HasSuffix(err.Error(), "No such file or directory\"") {
 			if len(gZPool) == 0 {
 				log.Errorf("Datastore mountpoint \"%s\" does not exist. Specify a pool if you want to create it.", dstore)
 				return
 			}
 			// Create dataset /iocage
 			rootDSName := fmt.Sprintf("%s%s", gZPool, dstore)
 			log.Debugf("Creating dataset %s mounted on %s\n", rootDSName, dstore)
 			if err = zfsCreateDataset(rootDSName, dstore, ""); err != nil {
 				log.Errorf("Error creating dataset %s: %v\n", rootDSName, err)
 				return
 			}
 			// Create /iocage/jail, releases, templates
 			for _, l := range []string{"jails","releases","templates"} {
 				cds := fmt.Sprintf("%s/%s", rootDSName, l)
 				cmp := fmt.Sprintf("%s/%s", dstore, l)
 				log.Debugf("Creating dataset %s mounted on %s\n", cds, cmp)
 				if err = zfsCreateDataset(cds, cmp, ""); err != nil {
 					log.Errorf("Error creating dataset %s: %v\n", cds, err)
 					return
 				}
 			}
 			// Create /iocage/defaults.json
 			exists, err := doFileExist(fmt.Sprintf("%s/defaults.json", dstore))
 			if err != nil {
 				log.Errorf("Error checking defaults.json: %v\n", err)
 				return
 			}
 			if !exists {
 				if err = createDefaultsJson(dstore, gBridge); err != nil {
 					log.Errorf("%v\n", err)
 				}
 			}
 		} else if err != nil {
 			log.Errorf("Error checking datastore existence: %v\n", err)
 			return
 		} else {
 			log.Debugf("Datastore dataset exist: %s\n", dset)
 		}
 	}
 	// Check and create bridge
 	// FIXME: What if bridge name is invalid, as we already wrote it in defaults.json in dstore loop?
 	if len(gBridge) > 0 && len(gInterface) > 0 {
 		if err := initBridge(); err != nil {
 			log.Errorf("%v\n", err)
 		}
 	}
 }
 func createDefaultsJson(rootDirectory string, bridge string) error {
 	hostid, err := os.ReadFile("/etc/hostid")
 	if err != nil {
 		log.Fatalf("Unable to read /etc/hostid: %v\n", err)
 	}
 	json := strings.Replace(gDefaultsJson, "TO-BE-REPLACED-WITH-HOSTID", strings.Trim(string(hostid), "\n"), 1)
 	json = strings.Replace(json, "TO-BE-REPLACED-WITH-BRIDGE", bridge, 1)
 	if err := os.WriteFile(fmt.Sprintf("%s/defaults.json", rootDirectory), []byte(json), 0640); err != nil {
 		log.Fatal(err)
 	}
 	return nil
 }
 func createInterface(iface string) error {
 	log.Debugf("creating interface \"%s\"\n", iface)
 	cmd := fmt.Sprintf("/sbin/ifconfig %s create", iface)
 	_, err := executeCommand(cmd)
 	if err != nil {
 		return err
 	}
 	return nil
 }
 func bringUpInterface(iface string) error {
 	log.Debugf("bringing up interface \"%s\"\n", iface)
 	cmd := fmt.Sprintf("/sbin/ifconfig %s up", iface)
 	_, err := executeCommand(cmd)
 	if err != nil {
 		return err
 	}
 	return nil
 }
 func addMemberToBridge(bridge string, iface string) error {
 	log.Debugf("adding member interface \"%s\" to bridge \"%s\"\n", iface, bridge)
 	cmd := fmt.Sprintf("/sbin/ifconfig %s addm %s", bridge, iface)
 	_, err := executeCommand(cmd)
 	if err != nil {
 		return err
 	}
 	return nil
 }
 func initBridge() error {
 	hostInt, err := gJailHost.GetInterfaces()
 	if err != nil {
 		return fmt.Errorf("Error listing interfaces: %v\n", err)
 	}
 	if !isStringInArray(hostInt, gInterface) {
 		return fmt.Errorf("Interface not found: %s\n", gInterface)
 	}
 	if !isStringInArray(hostInt, gBridge) {
 		if err := createInterface(gBridge); err != nil {
 			return fmt.Errorf("Error creating bridge: %v\n", err)
 		}
 		if err := bringUpInterface(gBridge); err != nil {
 			return fmt.Errorf("Error bringing up bridge: %v\n", err)
 		}
 		log.Infof("bridge was created, but it won't persist reboot. Configure rc.conf to persist. See https://docs.freebsd.org/en/books/handbook/advanced-networking/#network-bridging\n")
 		log.Infof("It is strongly suggested you move interface %s IP to bridge %s\n", gInterface, gBridge)
 	}
 	// FIXME: Need to check if not already member
 	members, err := getBridgeMembers(gBridge)
 	if err != nil {
 		return fmt.Errorf("Error getting bridge members: %v\n", err)
 	}
 	// Return if interface already member of the bridge
 	for _, m := range members {
 		log.Debugf("Bridge member: %s\n", m)
 		if strings.EqualFold(m, gInterface) {
 			return nil
 		}
 	}
 	if err := addMemberToBridge(gBridge, gInterface); err != nil {
 		return fmt.Errorf("Error adding interface to bridge: %v\n", err)
 	}
 	return nil
 }
--- a/cmd/jailhost.go
+++ b/cmd/jailhost.go
@ -4,6 +4,7 @@ import (
 	"fmt"
 	"net"
 	"regexp"
 	"strconv"
 	"strings"
 	"io/ioutil"
 	"golang.org/x/net/route"
@ -189,17 +190,34 @@ func getArch() (string, error) {
 func getFreeBSDVersion() (FreeBSDVersion, error) {
 	var version FreeBSDVersion
 	regex := `([0-9]{1,2})(\.)?([0-9]{1,2})?\-([^\-]*)(\-)?(p[0-9]{1,2})?`
 	re := regexp.MustCompile(regex)
 	out, err := executeCommand("/bin/freebsd-version")
 	if err != nil {
 		return version, fmt.Errorf("Error executing \"/bin/freebsd-version\": %v", err)
 	}
-	version, err = freebsdVersionToStruct(out)
+	if re.MatchString(out) {
-	if err != nil {
+		version.major, err = strconv.Atoi(re.FindStringSubmatch(out)[1])
-		return version, err
+		if err != nil {
 			return version, err
 		}
 		version.minor, err = strconv.Atoi(re.FindStringSubmatch(out)[3])
 		if err != nil {
 			return version, err
 		}
 		version.flavor = strings.Trim(re.FindStringSubmatch(out)[4], "\n")
 		// Skip the 'p' starting patch level
 		if len(re.FindStringSubmatch(out)[6]) > 0 {
 			version.patchLevel, err = strconv.Atoi(re.FindStringSubmatch(out)[6][1:])
 			if err != nil {
 				return version, err
 			}
 		}
 	}
 	return version, nil
 }
--- a/cmd/list.go
+++ b/cmd/list.go
@ -52,7 +52,7 @@ func ListJails(args []string, display bool) {
 	for _, ds := range gDatastores {
 		listJailsFromDatastore(ds, args, display)
 	}
-
+	
 	// Only when displaying jails, we accept to process multiple same name jails
 	if false == display {
 		for _, j := range gJails {
@ -68,11 +68,11 @@ func ListJails(args []string, display bool) {
 					break
 				}
 			}
-
+			
 			if true == skip {
 				continue
 			}
-
+			
 			// Initialize if not found in nameChecked
 			if false == found {
 				curCheck = &uniqueJailName{jail: j.Name,
@ -81,11 +81,11 @@ func ListJails(args []string, display bool) {
 			} else {
 				found = false
 			}
-
+			
 			if countOfJailsWithThisName(j.Name) > 1 {
 				//fmt.Printf("DEBUG: Jail %s exist multiple times, now checking if specified with full name\n", j.Name)
 				curCheck.unique = false
-
+				
 				for _, a := range args {
 					//fmt.Printf("DEBUG: comparing %s/%s with %s\n", j.Datastore, j.Name, a)
 					if strings.EqualFold(a, fmt.Sprintf("%s/%s", j.Datastore, j.Name)) {
@ -96,7 +96,7 @@ func ListJails(args []string, display bool) {
 			}
 			nameChecked = append(nameChecked, curCheck)
 		}
-
+		
 		// Now check
 		for _, a := range args {
 			for _, n := range nameChecked {
@ -107,9 +107,9 @@ func ListJails(args []string, display bool) {
 			}
 		}
 	}
-
+	
 	fields := strings.Split(gDisplayJColumns, ",")
-
+	
 	// This is the structure we will filter, then display
 	var jails []Jail
@ -275,13 +275,6 @@ func listJailsFromDirectory(dir string, dsname string) ([]Jail, error) {
 					// FIXME ??? Shouldn't be ioc-$Name ?
 					j.InternalName = rj.Name
 					j.Devfs_ruleset = rj.Devfs_ruleset
 					// Update release
 					r, err := getVersion(&j)
 					if err != nil {
 						fmt.Printf("ERROR getting jail %s version: %s\n", j.Name, err.Error())
 					} else {
 						j.Config.Release = r
 					}
 					break
 				}
 			}
--- a/cmd/properties.go
+++ b/cmd/properties.go
@ -1,9 +1,8 @@
 package cmd
 import (
 	"os"
 	"fmt"
 	"errors"
 	"fmt"
 	"reflect"
 	"strconv"
 	"strings"
@ -21,7 +20,7 @@ func GetJailProperties(args []string) {
 				jail, err = getJailFromArray(a, []string{""}, gJails)
 				if err != nil {
 					fmt.Printf("Error: %s\n", err.Error())
-					os.Exit(1)
+					return
 				}
 			} else {
 				props = append(props, a)
@ -106,20 +105,20 @@ func SetJailProperties(args []string) {
 		return
 	}
-	cj, err := getJailFromArray(jail.Name, []string{""}, gJails)
+	// Get jail by index to modify it
-	if err != nil {
+	for i, _ := range gJails {
-		fmt.Printf("Error getting jail %s: %v\n", jail.Name, err)
+		if gJails[i].Name == jail.Name {
-		return
+			for _, p := range props {
-	}
+				err := setStructFieldValue(&gJails[i], p.name, p.value)
-
+				if err != nil {
-	for _, p := range props {
+					fmt.Printf("Error: %s\n", err.Error())
-		err := setStructFieldValue(cj, p.name, p.value)
+					return
-		if err != nil {
+				} else {
-			fmt.Printf("Error: %s\n", err.Error())
+					fmt.Printf("%s: %s set to %s\n", gJails[i].Name, p.name, p.value)
-			return
+					gJails[i].ConfigUpdated = true
-		} else {
+				}
-			fmt.Printf("%s: %s set to %s\n", cj.Name, p.name, p.value)
+			}
 			writeConfigToDisk(&gJails[i], false)
 		}
 	}
 	cj.WriteConfigToDisk(false)
 }
--- a/cmd/root.go
+++ b/cmd/root.go
@ -14,7 +14,7 @@ import (
 )
 const (
-	gVersion = "0.42h"
+	gVersion = "0.37"
 	// TODO : Get from $jail_zpool/defaults.json
 	MIN_DYN_DEVFS_RULESET = 1000
@ -22,10 +22,9 @@ const (
 type createArgs struct {
 	Release      string
-	BaseJail     bool
+	BaseTemplate string
 	Datastore    string
 	JailType     string
 	Properties   string
 }
 var (
@ -52,15 +51,11 @@ var (
 	gNoJailLineSep   bool
 	gNoSnapLineSep   bool
 	gNoDSLineSep     bool
 	gBridgeStaticMac bool
 	gHostVersion float64
 	gTimeZone     string
 	gSnapshotName string
 	gZPool        string
 	gBridge       string
 	gInterface    string
 	gMigrateDestDatastore string
 	gYesToAll             bool
@ -69,16 +64,6 @@ var (
 	gFetchIntoDS     string
 	gFetchFrom       string
 	gUpgradeRelease  string
 	gUpdateRelease   string
 	gUpdateReleaseDS string
 	// For a based jail, these are directories binded to basejail
 	gBaseDirs = []string{"bin", "boot", "lib", "libexec", "rescue", "sbin", "usr/bin", "usr/include",
 		"usr/lib", "usr/lib32", "usr/libdata", "usr/libexec", "usr/sbin", "usr/share"}
 	// These directories are to be created empty
 	gEmptyDirs = []string{"dev", "media", "mnt", "net", "proc"}
 	// Copy these from base template
 	gCopyDirs = []string{"etc", "root", "tmp", "var"}
 	gMdevfs          sync.Mutex
@ -100,21 +85,23 @@ It support iocage jails and can coexist with iocage.`,
 		Long:  `Let this show you how much fail I had to get this *cough* perfect`,
 		Run: func(cmd *cobra.Command, args []string) {
 			fv, _ := getFreeBSDVersion()
-			if fv.patchLevel > 0 {
+			fmt.Printf("GoCage v.%s on FreeBSD %d.%d-%s\n", gVersion, fv.major, fv.minor, fv.flavor)
 				fmt.Printf("GoCage v.%s on FreeBSD %d.%d-%s-p%d\n", gVersion, fv.major, fv.minor, fv.flavor, fv.patchLevel)
 			} else {
 				fmt.Printf("GoCage v.%s on FreeBSD %d.%d-%s\n", gVersion, fv.major, fv.minor, fv.flavor)
 			}
 		},
 	}
-
+	
 	/* TODO
 	Initialize datastore(s) /iocage, /iocage/jails
 	Put defaults.json, update it with hostid,interfaces, and maybe other necessary fields
 	Initialize bridge
 	initCmd = &cobra.Command{
 		Use:   "init",
 		Short: "Initialize GoCage",
 		//Long:  `Let this show you how much fail I had to get this *cough* perfect`,
 		Run: func(cmd *cobra.Command, args []string) {
-			InitGoCage(args)
+			fv, _ := getFreeBSDVersion()
 			fmt.Printf("GoCage v.%s on FreeBSD %d.%d-%s\n", gVersion, fv.major, fv.minor, fv.flavor)
 		},
-	}
+	}*/
 	listCmd = &cobra.Command{
 		Use:   "list",
@ -384,11 +371,6 @@ func init() {
 	rootCmd.PersistentFlags().BoolVar(&gDebug, "debug", false, "Debug mode")
 	// Command dependant switches
 	initCmd.Flags().StringVarP(&gZPool, "pool", "p", "", "ZFS pool to create datastore on")
 	initCmd.Flags().StringVarP(&gBridge, "bridge", "b", "", "bridge to create for jails networking")
 	initCmd.Flags().StringVarP(&gInterface, "interface", "i", "", "interface to add as bridge member. This should be your main interface")
 	initCmd.MarkFlagRequired("bridge")
 	initCmd.MarkFlagsRequiredTogether("bridge", "interface")
 	// We reuse these flags in "gocage snapshot list myjail" and 'gocage datastore list" commands
 	listCmd.Flags().StringVarP(&gDisplayJColumns, "outcol", "o", "JID,Name,Config.Release,Config.Ip4_addr,Running", "Show these columns in output")
@ -421,28 +403,22 @@ func init() {
 	migrateCmd.MarkFlagRequired("datastore")
 	fetchCmd.Flags().StringVarP(&gFetchRelease, "release", "r", "", "Release to fetch (e.g.: \"13.1-RELEASE\"")
-	fetchCmd.Flags().StringVarP(&gFetchIntoDS, "datastore", "d", "", "Datastore release will be saved to")
+	fetchCmd.Flags().StringVarP(&gFetchIntoDS, "datastore", "o", "", "Datastore release will be saved to")
-	fetchCmd.Flags().StringVarP(&gFetchFrom, "from", "f", "", "Repository to download from. Should contain XY.Z-RELEASE. File protocol supported")
+	fetchCmd.Flags().StringVarP(&gFetchFrom, "from", "d", "", "Repository to download from. Should contain XY.Z-RELEASE. File protocol supported")
 	fetchCmd.MarkFlagRequired("release")
 	fetchCmd.MarkFlagRequired("datastore")
 	upgradeCmd.Flags().StringVarP(&gUpgradeRelease, "release", "r", "", "Release to upgrade to (e.g.: \"13.1-RELEASE\"")
 	upgradeCmd.MarkFlagRequired("release")
 	updateCmd.Flags().StringVarP(&gUpdateRelease, "release", "r", "", "Release to update (e.g.: \"13.1-RELEASE\"")
 	updateCmd.Flags().StringVarP(&gUpdateReleaseDS, "datastore", "d", "", "Datastore release is stored on")
 	updateCmd.MarkFlagsRequiredTogether("release", "datastore")
 	createCmd.Flags().StringVarP(&gCreateArgs.Release, "release", "r", "", "Release for the jail (e.g.: \"13.1-RELEASE\"")
-	createCmd.Flags().BoolVarP(&gCreateArgs.BaseJail, "basejail", "b", false, "Basejail. This will create a jail mounted read only from a release, so every up(date|grade) made to this release will immediately propagate to new jail.\n")
+	createCmd.Flags().StringVarP(&gCreateArgs.BaseTemplate, "basetpl", "b", "", "Base template. This will create a jail based on basetpl, so every up(date|grade) made to basetpl will immediately propagate to new jail\n")
 	createCmd.Flags().StringVarP(&gCreateArgs.Datastore, "datastore", "d", "", "Datastore to create the jail on. Defaults to first declared in config.")
 	createCmd.Flags().StringVarP(&gCreateArgs.Properties, "configuration", "p", "", "Configuration properties with format k1=v1,k2=v2 (Ex: \"Config.Ip4_addr=vnet0|192.168.1.2,Config.Ip6=none\")")
 	// Now declare commands
 	rootCmd.AddCommand(initCmd)
 	rootCmd.AddCommand(versionCmd)
 	rootCmd.AddCommand(listCmd)
-	rootCmd.AddCommand(listPropsCmd)
+	listCmd.AddCommand(listPropsCmd)
 	rootCmd.AddCommand(stopCmd)
 	rootCmd.AddCommand(startCmd)
 	rootCmd.AddCommand(restartCmd)
@ -457,6 +433,7 @@ func init() {
 	rootCmd.AddCommand(updateCmd)
 	rootCmd.AddCommand(upgradeCmd)
 	rootCmd.AddCommand(createCmd)
 	rootCmd.AddCommand(testCmd)
 	snapshotCmd.AddCommand(snapshotListCmd)
@ -486,6 +463,17 @@ func initConfig() {
 		fmt.Printf("ERROR reading config file %s : %s\n", gConfigFile, err.Error())
 		os.Exit(1)
 	}
 	// Load default configs from datastores
 	err := ListDatastores(viper.GetStringSlice("datastore"), false)
 	if err != nil {
 		fmt.Printf("ERROR: error checking datastores: %v\n", err)
 		os.Exit(1)
 	}
 	//	fmt.Println("Using config file:", viper.ConfigFileUsed())
 	//	fmt.Printf("datastore in config : %s\n", viper.GetStringSlice("datastore"))
 	//	fmt.Printf("datastore.0 in config : %s\n", viper.GetStringSlice("datastore.0"))
 	// Command line flags have priority on config file
 	if rootCmd.Flags().Lookup("sudo") != nil && false == rootCmd.Flags().Lookup("sudo").Changed {
@ -519,28 +507,12 @@ func initConfig() {
 		fmt.Printf("More than 3 sort criteria is not supported!\n")
 		os.Exit(1)
 	}
-
+	
-	gBridgeStaticMac = viper.GetBool("static-macs")
+	
 	if gDebug {
 		log.SetLevel(log.DebugLevel)
 		log.Debugf("Debug mode enabled\n")
 	}
 	// no need to check prerequesites if we are initializing gocage
 	for _, rc := range rootCmd.Commands() {
 		//fmt.Printf("DEBUG: rootCmd subcommand: %v. Was it called? %s\n", rc.Use, rootCmd.Commands()[i].CalledAs())
 		if len(rc.CalledAs()) > 0 && strings.EqualFold("init", rc.CalledAs()) {
 			return
 		}
 	}
 	// Load default configs from datastores
 	err := ListDatastores(viper.GetStringSlice("datastore"), false)
 	if err != nil {
 		fmt.Printf("ERROR: error checking datastores: %v\n", err)
 		os.Exit(1)
 	}
 }
--- a/cmd/start.go
+++ b/cmd/start.go
@ -340,7 +340,7 @@ func configureDhcpOrAcceptRtadv(jail *Jail, ipproto int, enable bool) error {
 		if ipproto == IPv6 {
 			key = fmt.Sprintf("%s_ipv6", key)
-			value = "\"inet6 auto_linklocal accept_rtadv autoconf\""
+			value = "inet6 auto_linklocal accept_rtadv autoconf"
 		}
 		if enable == true {
@ -363,7 +363,7 @@ func checkRtsold(jail *Jail) error {
 	if strings.Contains(jail.Config.Ip6_addr, "accept_rtadv") == false {
 		return fmt.Errorf("Must set at least one ip6_addr to accept_rtadv!\n")
 	}
-	err := enableRcKeyValue(fmt.Sprintf("%s/etc/rc.conf", jail.RootPath), "rtsold_enable", "yes")
+	err := enableRcKeyValue(jail.ConfigPath, "rtsold_enable", "yes")
 	if err != nil {
 		return fmt.Errorf("ERROR setting rtsold_enable=YES with sysrc for jail %s: %s\n", jail.Name, err)
 	}
@ -810,9 +810,7 @@ func generateMAC(jail *Jail, nic string) ([]byte, []byte, error) {
 	}
 	hsmac := append(prefix, suffix...)
-	jsmac := make([]byte, 6)
+	jsmac := append(hsmac[:5], hsmac[5]+1)
 	copy(jsmac, hsmac)
 	jsmac[5] = jsmac[5] + 1
 	// Save MACs to config
 	pname := fmt.Sprintf("Config.%s_mac", strings.Title(nic))
@ -842,7 +840,7 @@ func setupVnetInterfaceHostSide(jail *Jail) ([]string, error) {
 		bridge := v[1]
 		// Get host side MAC
-		pname := fmt.Sprintf("Config.%s_mac", strings.Title(nic))
+		pname := fmt.Sprintf("Config.%s_mac", nic)
 		var val *reflect.Value
 		val, pname, err = getStructFieldValue(jail, pname)
 		if err != nil {
@ -855,22 +853,13 @@ func setupVnetInterfaceHostSide(jail *Jail) ([]string, error) {
 				return []string{}, err
 			}
 		} else {
-			if strings.EqualFold(val.String(), "none") {
+			hsmac = val.Bytes()
 				hsmac, _, err = generateMAC(jail, nic)
 				if err != nil {
 					return []string{}, err
 				}
 			}
 			hsmac, err = hex.DecodeString(strings.Split(val.String(), " ")[0])
 			if err != nil {
 				return []string{}, fmt.Errorf("Error converting %s to hex\n", strings.Split(val.String(), " ")[0])
 			}
 		}
 		// Get bridge MTU
 		mtu, err := gJailHost.GetBridgeMTU(bridge)
 		if err != nil {
-			return []string{}, fmt.Errorf("Error getting bridge \"%s\" mtu: %v\n", bridge, err)
+			return []string{}, fmt.Errorf("Error getting bridge mtu: %v\n", err)
 		}
 		// Create epair interface
@ -910,7 +899,7 @@ func setupVnetInterfaceHostSide(jail *Jail) ([]string, error) {
 	return epairs, nil
 }
-func setupVnetInterfaceJailSide(jail *Jail, hostepairs []string) error {
+func setupVnetInterfaceJailSide(jail *Jail) error {
 	var jsmac []byte
 	var err error
@ -920,9 +909,7 @@ func setupVnetInterfaceJailSide(jail *Jail, hostepairs []string) error {
 	for _, i := range strings.Split(jail.Config.Ip4_addr, ",") {
 		v := strings.Split(i, "|")
-		if len(v) > 1 {
+		ip4s[v[0]] = v[1]
 			ip4s[v[0]] = v[1]
 		}
 	}
 	for _, i := range strings.Split(jail.Config.Ip6_addr, ",") {
 		v := strings.Split(i, "|")
@ -932,7 +919,7 @@ func setupVnetInterfaceJailSide(jail *Jail, hostepairs []string) error {
 	}
 	// Loop through configured interfaces
-	for i, nicCnf := range strings.Split(jail.Config.Interfaces, ",") {
+	for _, nicCnf := range strings.Split(jail.Config.Interfaces, ",") {
 		v := strings.Split(nicCnf, ":")
 		if len(v) != 2 {
 			return fmt.Errorf("Invalid value for Interfaces: %s\n", nicCnf)
@ -943,11 +930,9 @@ func setupVnetInterfaceJailSide(jail *Jail, hostepairs []string) error {
 		// inside jail final nic name
 		jnic := strings.Replace(v[0], "vnet", "epair", 1)
 		jnic = jnic + "b"
 		// host side associated jail nic name
 		jsepair := fmt.Sprintf("%sb", strings.TrimSuffix(hostepairs[i], "a"))
 		// Get jail side MAC
-		pname := fmt.Sprintf("Config.%s_mac", strings.Title(nic))
+		pname := fmt.Sprintf("Config.%s_mac", nic)
 		var val *reflect.Value
 		val, pname, err = getStructFieldValue(jail, pname)
 		if err != nil {
@ -960,14 +945,10 @@ func setupVnetInterfaceJailSide(jail *Jail, hostepairs []string) error {
 				return err
 			}
 		} else {
-			jsmac, err = hex.DecodeString(strings.Split(val.String(), " ")[1])
+			jsmac = val.Bytes()
                        if err != nil {
                                return fmt.Errorf("Error converting %s to hex\n", strings.Split(val.String(), " ")[1])
                        }
 		}
-		cmd := fmt.Sprintf("/sbin/ifconfig %s vnet %s", jsepair, jail.InternalName)
+		cmd := fmt.Sprintf("/sbin/ifconfig %s vnet %s", jnic, jail.InternalName)
 		_, err := executeCommand(cmd)
 		if err != nil {
 			return fmt.Errorf("Error linking interface to jail: %v\n", err)
@ -976,17 +957,17 @@ func setupVnetInterfaceJailSide(jail *Jail, hostepairs []string) error {
 		// Get bridge MTU
 		mtu, err := gJailHost.GetBridgeMTU(bridge)
 		if err != nil {
-			return fmt.Errorf("Error getting bridge \"%s\" mtu: %v\n", bridge, err)
+			return fmt.Errorf("Error getting bridge %s mtu: %v\n", bridge, err)
 		}
-		cmd = fmt.Sprintf("/usr/sbin/jexec %d ifconfig %s mtu %d", jail.JID, jsepair, mtu)
+		cmd = fmt.Sprintf("/usr/sbin/jexec %d ifconfig %s mtu %d", jail.JID, jnic, mtu)
 		_, err = executeCommand(cmd)
 		if err != nil {
 			return fmt.Errorf("Error setting mtu: %v\n", err)
 		}
 		// rename epairXXb to epair0b (or opair1b, ...)
-		cmd = fmt.Sprintf("/usr/sbin/setfib %s jexec %d ifconfig %s name %s", jail.Config.Exec_fib, jail.JID, jsepair, jnic)
+		cmd = fmt.Sprintf("/usr/sbin/setfib %s jexec %d ifconfig %s name %s", jail.Config.Exec_fib, jail.JID, jnic, jnic)
 		_, err = executeCommand(cmd)
 		if err != nil {
 			return fmt.Errorf("Error linking interface to jail: %v\n", err)
@ -1007,19 +988,6 @@ func setupVnetInterfaceJailSide(jail *Jail, hostepairs []string) error {
 			if err != nil {
 				return fmt.Errorf("Error adding member %s to %s: %v: %s\n", nic, bridge, err, out)
 			}
 			// Fix mac flapping and instabilities with bridged vnet network
 			if gBridgeStaticMac {
 				printablemac := hex.EncodeToString(jsmac)
 				for i := 2 ; i < len(printablemac) ; i += 3 {
 					printablemac = printablemac[:i] + ":" + printablemac[i:]
 				}
 				log.Debugf("Set %s.%d as static to %s in %s address cache\n", nic, jail.JID, printablemac, bridge)
 				cmd = fmt.Sprintf("/sbin/ifconfig %s static %s.%d %s", bridge, nic, jail.JID, printablemac)
 				out, err := executeCommand(cmd)
 				if err != nil {
 					return fmt.Errorf("Error setting %s.%d static with %s on %s: %v: %s\n", nic, jail.JID, printablemac, bridge, err, out)
 				}
 			}
 		}
 		// Check we have an IP for the nic, and set it into jail
@ -1102,9 +1070,9 @@ func StartJailsAtBoot() {
 	var curThNb int
 	var curPri int
-	// Get boot enabled non-template jails
+	// Get boot enabled jails
 	for _, j := range gJails {
-		if j.Config.Boot > 0 && !strings.EqualFold(j.Config.Jailtype, "template") {
+		if j.Config.Boot > 0 {
 			startList = append(startList, j)
 		}
 	}
@ -1198,7 +1166,7 @@ func StartJail(args []string) {
 	for _, a := range args {
 		// Check if jail exist and is distinctly named
-		cj, err = getJailFromArray(a, []string{"basejail", "jail"}, gJails)
+		cj, err = getJailFromArray(a, []string{"jail"}, gJails)
 		if err != nil {
 			fmt.Printf("Error getting jail: %s\n", err)
 			continue
@ -1210,7 +1178,7 @@ func StartJail(args []string) {
 		}
 		fmt.Printf("> Starting jail %s\n", cj.Name)
-
+		
 		// Set InternalName as it is used by some of these
 		cj.InternalName = fmt.Sprintf("ioc-%s", cj.Name)
@ -1372,34 +1340,34 @@ func StartJail(args []string) {
 				cj.Config.Defaultrouter = ip4[0]
 			}
 		}
-
+		
 		// See https://github.com/iocage/iocage/blob/e94863d4c54f02523fb09e62e48be7db9ac92eda/iocage_lib/ioc_start.py:401
 		if cj.Config.Vnet == 0 {
 			// Not supported
 			fmt.Printf("Only VNet jails supported\n")
 			return
 		}
-
+		
 		var net []string
 		if false == strings.EqualFold(cj.Config.Vnet_interfaces, "none") {
 			net = append(net,  strings.Split(cj.Config.Vnet_interfaces, " ")...)
 		}
-
+		
 		err, dynrs := buildDevfsRuleSet(cj, &gMdevfs)
 		if err != nil {
 			fmt.Printf("%s\n", err.Error())
 			return
 		}
-
+		
 		err = buildJailParameters(cj, dynrs)
 		if err != nil {
 			fmt.Printf("%s\n", err.Error())
 			return
 		}
-
+		
 		// Synchronize jail config to disk
-		cj.WriteConfigToDisk(false)
+		writeConfigToDisk(cj, false)
-
+		
 		start_cmd := fmt.Sprintf("/usr/sbin/jail -f /var/run/jail.%s.conf -c", cj.InternalName)
 		//TODO: handle start_env & prestart_env, could be used by iocage plugins
@ -1409,17 +1377,17 @@ func StartJail(args []string) {
 			fmt.Printf("Aborting jail start\n")
 			return
 		}
-
+		
 		fmt.Printf("  > Start jail:\n")
 		_, err = executeCommand(start_cmd)
 		if err != nil {
 			fmt.Printf("Error starting jail %s: %v\n", cj.Name, err)
 			return
 		}
-
+		
 		fmt.Printf("  > Start jail: OK\n")
 		fmt.Printf("  > With devfs ruleset %d\n", dynrs)
-
+		
 		// Update running state, JID and Devfs_ruleset
 		cj.Running = true
 		cj.Devfs_ruleset = dynrs
@ -1433,13 +1401,13 @@ func StartJail(args []string) {
 				break
 			}
 		}
-
+		
 		hostInt, err := gJailHost.GetInterfaces()
 		if err != nil {
 			fmt.Printf("Error listing jail host interfaces: %v\n", err)
 			return
 		}
-
+		
 		if false == strings.EqualFold(cj.Config.Vnet_default_interface, "auto") &&
 			false == strings.EqualFold(cj.Config.Vnet_default_interface, "none") &&
 			false == isStringInArray(hostInt, cj.Config.Vnet_default_interface) {
@ -1448,20 +1416,20 @@ func StartJail(args []string) {
 		}
 		fmt.Printf("  > Setup VNet network:\n")
-		hsepairs, err := setupVnetInterfaceHostSide(cj);
+		_, err = setupVnetInterfaceHostSide(cj); 
 		if err != nil {
 			fmt.Printf("Error setting VNet interface host side: %v\n", err)
 			return
 		}
-
+		
-		if err = setupVnetInterfaceJailSide(cj, hsepairs); err != nil {
+		if err = setupVnetInterfaceJailSide(cj); err != nil {
 			fmt.Printf("Error setting VNet interface jail side: %v\n", err)
 			return
 		}
 		fmt.Printf("  > Setup VNet network: OK\n")
 		// Set default route, unless main network is dhcp
-		if ! cj.isFirstNetDhcp() && !strings.EqualFold(cj.Config.Ip4_addr, "none") {
+		if ! cj.isFirstNetDhcp() {
 			fmt.Printf("  > Setup default ipv4 gateway:\n")
 			cmd := fmt.Sprintf("/usr/sbin/setfib %s /usr/sbin/jexec %d route add default %s", cj.Config.Exec_fib, cj.JID, cj.Config.Defaultrouter)
 			out, err := executeCommand(cmd)
@ -1471,7 +1439,7 @@ func StartJail(args []string) {
 				fmt.Printf("  > Setup default ipv4 gateway: OK\n")
 			}
 		}
-
+		
 		if cj.Config.Ip6_addr != "none" {
 			fmt.Printf("  > Setup default ipv6 gateway:\n")
 			cmd := fmt.Sprintf("/usr/sbin/setfib %s /usr/sbin/jexec %d route add -6 default %s", cj.Config.Exec_fib, cj.JID, cj.Config.Defaultrouter6)
@ -1482,7 +1450,7 @@ func StartJail(args []string) {
 				fmt.Printf("  > Setup default ipv6 gateway: OK\n")
 			}
 		}
-
+		
 		if cj.Config.Jail_zfs > 0 {
 			fmt.Printf("  > Jail ZFS datasets:\n")
 			err = jailZfsDatasets(cj)
@ -1497,14 +1465,14 @@ func StartJail(args []string) {
 		if err != nil {
 			fmt.Printf("%s\n", err)
 		}
-
+		
 		if cj.Config.Host_time > 0 {
 			err = copyLocalTime(cj)
 			if err != nil {
 				fmt.Printf("%s\n", err)
 			}
 		}
-
+		
 		// Start services
 		if len(cj.Config.Exec_start) > 0 {
 			fmt.Printf("  > Start services:\n")
@ -1516,7 +1484,7 @@ func StartJail(args []string) {
 				fmt.Printf("  > Start services: OK\n")
 			}
 		}
-
+		
 		if cj.Config.Rtsold > 0 || strings.EqualFold(cj.Config.Ip6_addr, "accept_rtadv") {
 			fmt.Printf("  > Start rtsold:\n")
 			cmd := fmt.Sprintf("/usr/sbin/setfib %s /usr/sbin/jexec %d service rtsold start", cj.Config.Exec_fib, cj.JID)
@ -1527,7 +1495,7 @@ func StartJail(args []string) {
 				fmt.Printf("  > Start rtsold: OK\n")
 			}
 		}
-
+		
 		// TODO: Execute Exec_poststart
 		if len(cj.Config.Exec_poststart) > 0 {
 			fmt.Printf("  > Execute post-start:\n")
@ -1539,18 +1507,19 @@ func StartJail(args []string) {
 				fmt.Printf("  > Execute post-start: OK\n")
 			}
 		}
-
+		
 		// WIP 10/07/2022 : https://github.com/iocage/iocage/blob/master/iocage_lib/ioc_start.py#L891
 		// TODO: Handle dhcp
 		// TODO: Apply rctl
-
+		
 		// Update last_started
 		// 23/07/2023 : This is not working, when writing to disk the old value is used
 		dt := time.Now()
 		curDate := fmt.Sprintf("%s", dt.Format("2006-01-02 15:04:05"))
 		cj.Config.Last_started = curDate
 		writeConfigToDisk(cj, false)
-
+		
 		/*
 			out, err := executeCommand(fmt.Sprintf("rctl jail:%s", cj.InternalName))
 			if err == nil && len(out) > 0 {
--- a/cmd/stop.go
+++ b/cmd/stop.go
@ -83,30 +83,15 @@ func umountAndUnjailZFS(jail *Jail) error {
 }
 func destroyVNetInterfaces(jail *Jail) error {
-	if !strings.EqualFold(jail.Config.Ip4_addr, "none") {
+	for _, i := range strings.Split(jail.Config.Ip4_addr, ",") {
-		for _, i := range strings.Split(jail.Config.Ip4_addr, ",") {
+		iname := fmt.Sprintf("%s.%d", strings.Split(i, "|")[0], jail.JID)
-			iname := fmt.Sprintf("%s.%d", strings.Split(i, "|")[0], jail.JID)
+		fmt.Printf("%s: ", iname)
-			fmt.Printf("%s: ", iname)
+		_, err := executeCommand(fmt.Sprintf("ifconfig %s destroy", iname))
-			_, err := executeCommand(fmt.Sprintf("ifconfig %s destroy", iname))
+		//_, err := executeScript(fmt.Sprintf("ifconfig %s destroy >/dev/null 2>&1", iname))
-			//_, err := executeScript(fmt.Sprintf("ifconfig %s destroy >/dev/null 2>&1", iname))
+		if err != nil {
-			if err != nil {
+			return err
-				return err
+		} else {
-			} else {
+			fmt.Printf("OK\n")
 				fmt.Printf("OK\n")
 			}
 		}
 	}
 	if !strings.EqualFold(jail.Config.Ip6_addr, "none") {
 		for _, i := range strings.Split(jail.Config.Ip6_addr, ",") {
 			iname := fmt.Sprintf("%s.%d", strings.Split(i, "|")[0], jail.JID)
 			fmt.Printf("%s: ", iname)
 			_, err := executeCommand(fmt.Sprintf("ifconfig %s destroy", iname))
 			//_, err := executeScript(fmt.Sprintf("ifconfig %s destroy >/dev/null 2>&1", iname))
 			if err != nil {
 				return err
 			} else {
 				fmt.Printf("OK\n")
 			}
 		}
 	}
@ -138,7 +123,7 @@ func deleteDevfsRuleset(ruleset int) error {
 	return nil
 }
-func umountFsFromHost(mountpoint string) error {
+func umountJailFsFromHost(jail *Jail, mountpoint string) error {
 	cmd := "mount -p"
 	out, err := executeCommand(cmd)
 	if err != nil {
@ -149,11 +134,11 @@ func umountFsFromHost(mountpoint string) error {
 	for _, l := range strings.Split(out, "\n") {
 		f := strings.Split(remSpPtrn.ReplaceAllString(l, " "), " ")
 		if len(f) > 2 {
-			if strings.EqualFold(f[1], mountpoint) {
+			if strings.EqualFold(f[1], fmt.Sprintf("%s%s", jail.RootPath, mountpoint)) {
-				cmd = fmt.Sprintf("umount %s", mountpoint)
+				cmd = fmt.Sprintf("umount %s%s", jail.RootPath, mountpoint)
 				_, err := executeCommand(cmd)
 				if err != nil {
-					return errors.New(fmt.Sprintf("Error umounting %s: %s", mountpoint, err.Error()))
+					return errors.New(fmt.Sprintf("Error umounting %s%s: %s", jail.RootPath, mountpoint, err.Error()))
 				}
 				return nil
 			}
@ -163,10 +148,6 @@ func umountFsFromHost(mountpoint string) error {
 	return nil
 }
 func umountJailFsFromHost(jail *Jail, mountpoint string) error {
 	return umountFsFromHost(fmt.Sprintf("%s%s", jail.RootPath, mountpoint))
 }
 // Internal usage only
 func stopJail(jail *Jail) error {
 	cmd := "jail -q"
@ -289,7 +270,7 @@ func StopJail(args []string) {
 	for _, a := range args {
 		// Check if jail exist and is distinctly named
-		cj, err = getJailFromArray(a, []string{"basejail", "jail"}, gJails)
+		cj, err = getJailFromArray(a, []string{"jail"}, gJails)
 		if err != nil {
 			fmt.Printf("Error getting jail: %s\n", err)
 			continue
@ -423,8 +404,7 @@ func StopJail(args []string) {
 			fmt.Printf("  > Umount mountpoints from %s\n", fstab)
 			errs := 0
 			for _, m := range mounts {
-				log.Debugf("Umounting %s\n", m.Mountpoint)
+				err = umountJailFsFromHost(cj, m.Mountpoint)
 				err = umountFsFromHost(m.Mountpoint)
 				if err != nil {
 					fmt.Printf("ERROR: %s\n", err.Error())
 					errs += 1
--- a/cmd/update.go
+++ b/cmd/update.go
@ -5,53 +5,43 @@ import (
 	"fmt"
 	//"log"
 	"time"
 	"strings"
 	"github.com/spf13/viper"
 )
 // Internal usage only
-func updateJail(jail *Jail, doUpdateVersion bool) error {
+func updateJail(jail *Jail) error {
 	// Create default config as temporary file
 	cfgFile, err := os.CreateTemp("", "gocage-jail-update-")
 	if err != nil {
 		return err
 	}
-	// Folder containing update/upgrade temporary files. Mutualized so we save bandwith when upgrading multiple jails
+	cfgFile.Write([]byte(fbsdUpdateConfig))
-	uwd := viper.GetString("updateWorkDir")
+
 	if len(uwd) == 0 {
 		return fmt.Errorf("updateWorkDir not set in configuration")
 	}
 	_, err = os.Stat(uwd)
 	if os.IsNotExist(err) {
 		if err := os.Mkdir(uwd, 0755); err != nil {
 			return err
 		}
 	}
 	cfgFile.Write([]byte(strings.Replace(fbsdUpdateConfig, "TO-BE-REPLACED-WITH-UPDATEWORKDIR", uwd, 1)))
 	defer cfgFile.Close()
 	defer os.Remove(cfgFile.Name())
-	cmd := fmt.Sprintf("/usr/sbin/freebsd-update --not-running-from-cron -f %s -b %s --currently-running %s fetch",
+	// Folder containing update/uipgrade temporary files. Common so we save bandwith when upgrading multiple jails
 	// TODO: Variabilize /iocage/freebsd-update
 	_, err = os.Stat("/iocage/freebsd-update")
 	if os.IsNotExist(err) {
 		if err := os.Mkdir("/iocage/freebsd-update", 0755); err != nil {
 			return err
 		}
 	}
 	cmd := fmt.Sprintf("/usr/sbin/freebsd-update --not-running-from-cron -f %s -b %s --currently-running %s fetch install", 
 					   cfgFile.Name(), jail.RootPath, jail.Config.Release)
 	//fmt.Printf("DEBUG: Prepare to execute \"%s\"\n", cmd)
 	err = executeCommandWithOutputToStdout(cmd)
 	if err != nil {
 		return err
 	}
-	cmd = fmt.Sprintf("/usr/sbin/freebsd-update --not-running-from-cron -f %s -b %s --currently-running %s install",
+	// Get and write new release into config.json
-			   cfgFile.Name(), jail.RootPath, jail.Config.Release)
+	updateVersion(jail)
 	err = executeCommandWithOutputToStdout(cmd)
 	if err != nil {
 		return err
 	}
 	// Get and write new release into config.json. Don't do that for fake jail (aka release updating)
 	if doUpdateVersion {
 		updateVersion(jail)
 	}
 	return nil
 }
@ -61,52 +51,6 @@ func UpdateJail(args []string) {
 	var cj *Jail
 	var err error
 	// User is updateing a release, fake a jail
 	if  len(gUpdateRelease) > 0 {
 		// get datastore mountpoing from datastore name
 		ds, err := getDatastoreFromArray(gUpdateReleaseDS, gDatastores)
 		if err != nil {
 			fmt.Printf("Error getting datastore %s: %v\n", gUpdateReleaseDS, err)
 			return
 		}
 		rp := fmt.Sprintf("%s/releases/%s/root", ds.Mountpoint, gUpdateRelease)
 		fakeJail := Jail{RootPath: rp}
 		v, err := getVersion(&fakeJail)
 		if err != nil {
 			fmt.Printf("Error getting version of release %s: %v\n", gUpdateRelease, err)
 			return
 		}
 		fakeJail.Config.Release = v
 		// Remove patch level from Release
 		fv, err := freebsdVersionToStruct(fakeJail.Config.Release)
 		if err != nil {
 			fmt.Printf("Error converting release %s: %v\n", fakeJail.Config.Release, err)
 			return
 		}
 		release := fmt.Sprintf("%d.%d-%s", fv.major, fv.minor, fv.flavor)
 		// Snapshot before updating
 		dt := time.Now()
 		curDate := fmt.Sprintf("%s", dt.Format("2006-01-02_15-04-05"))
 		snapshotName := fmt.Sprintf("gocage_update_%s_%s", v, curDate)
 		err = zfsSnapshot(fmt.Sprintf("%s/releases/%s", ds.ZFSDataset, release), snapshotName)
 		if err != nil {
 			fmt.Printf("Error snapshoting release %s: %v\n", gUpdateRelease, err)
 			return
 		}
 		err = zfsSnapshot(fmt.Sprintf("%s/releases/%s/root", ds.ZFSDataset, release), snapshotName)
 		if err != nil {
 			fmt.Printf("Error snapshoting release %s: %v\n", gUpdateRelease, err)
 		} else {
 			fmt.Printf("Release %s was snapshoted with success: %s\n", gUpdateRelease, snapshotName)
 		}
 		if err = updateJail(&fakeJail, false); err != nil {
 			fmt.Printf("Error updating release %s: %v\n", gUpdateRelease, err)
 		}
 		return
 	}
 	for _, a := range args {
 		// Check if jail exist and is distinctly named
 		cj, err = getJailFromArray(a, []string{""}, gJails)
@ -114,18 +58,12 @@ func UpdateJail(args []string) {
 			fmt.Printf("Error getting jail: %s\n", err)
 			continue
 		}
-
+		
 		// We cant update basejail as system is readonly
 		if strings.EqualFold(cj.Config.Jailtype, "basejail") {
 			fmt.Printf("%s is a basejail using %s system files. Please update %s!\n", cj.Name, cj.Config.Origin, cj.Config.Origin)
 			continue
 		}
 		fmt.Printf("  > Snapshot jail %s\n", cj.Name)
 		// Set snapshot name
 		dt := time.Now()
 		curDate := fmt.Sprintf("%s", dt.Format("2006-01-02_15-04-05"))
-		gSnapshotName = fmt.Sprintf("gocage_update_%s_%s", cj.Config.Release, curDate)
+		gSnapshotName = fmt.Sprintf("goc_update_%s_%s", cj.Config.Release, curDate)
 		err := createJailSnapshot(*cj)
 		if err != nil {
 			fmt.Printf("  > Snapshot jail %s: ERROR: %s\n", cj.Name, err.Error())
@ -134,7 +72,7 @@ func UpdateJail(args []string) {
 		fmt.Printf("  > Snapshot jail %s: OK\n", cj.Name)
 		fmt.Printf("  > Update jail %s\n", cj.Name)
-		err = updateJail(cj, true)
+		err = updateJail(cj)
 		if err != nil {
 			fmt.Printf("ERROR: %s\n", err.Error())
 		} else {
--- a/cmd/upgrade.go
+++ b/cmd/upgrade.go
@ -8,7 +8,6 @@ import (
 	//"log"
 	"time"
 	"strings"
 	"github.com/spf13/viper"
 )
 // Internal usage only
@ -19,20 +18,19 @@ func upgradeJail(jail *Jail, version string) error {
 		return err
 	}
-	// Folder containing update/upgrade temporary files. Mutualized so we save bandwith when upgrading multiple jails
+	cfgFile.Write([]byte(fbsdUpdateConfig))
-	uwd := viper.GetString("updateWorkDir")
+
-	if len(uwd) == 0 {
+	defer cfgFile.Close()
-		return fmt.Errorf("updateWorkDir not set in configuration")
+	defer os.Remove(cfgFile.Name())
-	}
+
-	_, err = os.Stat(uwd)
+	// Folder containing update/uipgrade temporary files. Common so we save bandwith when upgrading multiple jails
 	// TODO: Variabilize /iocage/freebsd-update
 	_, err = os.Stat("/iocage/freebsd-update")
 	if os.IsNotExist(err) {
-		if err := os.Mkdir(uwd, 0755); err != nil {
+		if err := os.Mkdir("/iocage/freebsd-update", 0755); err != nil {
 			return err
 		}
 	}
 	cfgFile.Write([]byte(strings.Replace(fbsdUpdateConfig, "TO-BE-REPLACED-WITH-UPDATEWORKDIR", uwd, 1)))
 	defer cfgFile.Close()
 	defer os.Remove(cfgFile.Name())
 	// Get current version. Won't work on stopped jail.
 	fbsdvers, err := executeCommandInJail(jail, "/bin/freebsd-version")
@ -41,6 +39,7 @@ func upgradeJail(jail *Jail, version string) error {
 		return err
 	}
 	fbsdvers = strings.TrimRight(fbsdvers, "\n")
 	//fbsdvers := jail.Config.Release
 	cmd := fmt.Sprintf("/usr/sbin/freebsd-update -f %s -b %s --currently-running %s -r %s upgrade", 
 			   cfgFile.Name(), jail.RootPath, fbsdvers, version)
--- a/cmd/utils.go
+++ b/cmd/utils.go
@ -8,7 +8,6 @@ import (
 	"sort"
 	"bufio"
 	"errors"
 	"regexp"
 	"os/exec"
 	"reflect"
 	"strconv"
@ -25,221 +24,140 @@ const (
 	ifconfigipv4re = `inet[[:space:]](` + ipv4re + `)`
 	// Maximum thread qty for start/stop
 	gMaxThreads    = 4
-
+	
-	fbsdUpdateConfig = `# $FreeBSD$
+	gDefaultsJson = ` {
-
+       "CONFIG_VERSION": "27",
-# Trusted keyprint.  Changing this is a Bad Idea unless you've received
+       "allow_chflags": 0,
-# a PGP-signed email from <security-officer@FreeBSD.org> telling you to
+       "allow_mlock": 0,
-# change it and explaining why.
+       "allow_mount": 0,
-KeyPrint 800651ef4b4c71c27e60786d7b487188970f4b4169cc055784e21eb71d410cc5
+       "allow_mount_devfs": 0,
-
+       "allow_mount_fusefs": 0,
-# Server or server pool from which to fetch updates.  You can change
+       "allow_mount_nullfs": 0,
-# this to point at a specific server if you want, but in most cases
+       "allow_mount_procfs": 0,
-# using a "nearby" server won't provide a measurable improvement in
+       "allow_mount_tmpfs": 0,
-# performance.
+       "allow_mount_zfs": 0,
-ServerName update.FreeBSD.org
+       "allow_quotas": 0,
-
+       "allow_raw_sockets": 0,
-# Components of the base system which should be kept updated.
+       "allow_set_hostname": 1,
-Components world
+       "allow_socket_af": 0,
-
+       "allow_sysvipc": 0,
-# Example for updating the userland and the kernel source code only:
+       "allow_tun": 0,
-# Components src/base src/sys world
+       "allow_vmm": 0,
-
+       "assign_localhost": 0,
-# Paths which start with anything matching an entry in an IgnorePaths
+       "available": "readonly",
-# statement will be ignored.
+       "basejail": 0,
-IgnorePaths
+       "boot": 0,
-
+       "bpf": 0,
-# Paths which start with anything matching an entry in an IDSIgnorePaths
+       "children_max": "0",
-# statement will be ignored by "freebsd-update IDS".
+       "comment": "none",
-IDSIgnorePaths /usr/share/man/cat
+       "compression": "lz4",
-IDSIgnorePaths /usr/share/man/whatis
+       "compressratio": "readonly",
-IDSIgnorePaths /var/db/locate.database
+       "coredumpsize": "off",
-IDSIgnorePaths /var/log
+       "count": "1",
-
+       "cpuset": "off",
-# Paths which start with anything matching an entry in an UpdateIfUnmodified
+       "cputime": "off",
-# statement will only be updated if the contents of the file have not been
+       "datasize": "off",
-# modified by the user (unless changes are merged; see below).
+       "dedup": "off",
-UpdateIfUnmodified /etc/ /var/ /root/ /.cshrc /.profile
+       "defaultrouter": "auto",
-
+       "defaultrouter6": "auto",
-# When upgrading to a new FreeBSD release, files which match MergeChanges
+       "depends": "none",
-# will have any local changes merged into the version from the new release.
+       "devfs_ruleset": "4",
-MergeChanges /etc/
+       "dhcp": 0,
-
+       "enforce_statfs": "2",
-### Default configuration options:
+       "exec_clean": 1,
-
+       "exec_created": "/usr/bin/true",
-# Directory in which to store downloaded updates and temporary
+       "exec_fib": "0",
-# files used by FreeBSD Update.
+       "exec_jail_user": "root",
-WorkDir TO-BE-REPLACED-WITH-UPDATEWORKDIR
+       "exec_poststart": "/usr/bin/true",
-
+       "exec_poststop": "/usr/bin/true",
-# Destination to send output of "freebsd-update cron" if an error
+       "exec_prestart": "/usr/bin/true",
-# occurs or updates have been downloaded.
+       "exec_prestop": "/usr/bin/true",
-# MailTo root
+       "exec_start": "/bin/sh /etc/rc",
-
+       "exec_stop": "/bin/sh /etc/rc.shutdown",
-# Is FreeBSD Update allowed to create new files?
+       "exec_system_jail_user": "0",
-# AllowAdd yes
+       "exec_system_user": "root",
-
+       "exec_timeout": "60",
-# Is FreeBSD Update allowed to delete files?
+       "host_domainname": "none",
-# AllowDelete yes
+       "host_time": 1,
-
+       "hostid": "36353536-3135-5a43-4a34-313130315a56",
-# If the user has modified file ownership, permissions, or flags, should
+       "hostid_strict_check": 0,
-# FreeBSD Update retain this modified metadata when installing a new version
+       "interfaces": "vnet0:bridge0",
-# of that file?
+       "ip4": "new",
-# KeepModifiedMetadata yes
+       "ip4_addr": "none",
-
+       "ip4_saddrsel": 1,
-# When upgrading between releases, should the list of Components be
+       "ip6": "new",
-# read strictly (StrictComponents yes) or merely as a list of components
+       "ip6_addr": "none",
-# which *might* be installed of which FreeBSD Update should figure out
+       "ip6_saddrsel": 1,
-# which actually are installed and upgrade those (StrictComponents no)?
+       "ip_hostname": 0,
-StrictComponents yes
+       "jail_zfs": 0,
-
+       "jail_zfs_mountpoint": "none",
-# When installing a new kernel perform a backup of the old one first
+       "last_started": "none",
-# so it is possible to boot the old kernel in case of problems.
+       "localhost_ip": "none",
-BackupKernel no
+       "login_flags": "-f root",
-
+       "mac_prefix": "2c44fd",
-# If BackupKernel is enabled, the backup kernel is saved to this
+       "maxproc": "off",
-# directory.
+       "memorylocked": "off",
-# BackupKernelDir /boot/kernel.old
+       "memoryuse": "off",
-
+       "min_dyn_devfs_ruleset": "1000",
-# When backing up a kernel also back up debug symbol files?
+       "mount_devfs": 1,
-BackupKernelSymbolFiles no
+       "mount_fdescfs": 1,
-
+       "mount_linprocfs": 0,
-# Create a new boot environment when installing patches
+       "mount_procfs": 0,
-CreateBootEnv no
+       "mountpoint": "readonly",
-`
+       "msgqqueued": "off",
-
+       "msgqsize": "off",
-	gDefaultsJson = `{
+       "nat": 0,
-    "CONFIG_VERSION": "27",
+       "nat_backend": "ipfw",
-    "allow_chflags": 0,
+       "nat_forwards": "none",
-    "allow_mlock": 0,
+       "nat_interface": "none",
-    "allow_mount": 0,
+       "nat_prefix": "172.16",
-    "allow_mount_devfs": 0,
+       "nmsgq": "off",
-    "allow_mount_fusefs": 0,
+       "notes": "none",
-    "allow_mount_nullfs": 0,
+       "nsem": "off",
-    "allow_mount_procfs": 0,
+       "nsemop": "off",
-    "allow_mount_tmpfs": 0,
+       "nshm": "off",
-    "allow_mount_zfs": 0,
+       "nthr": "off",
-    "allow_quotas": 0,
+       "openfiles": "off",
-    "allow_raw_sockets": 0,
+       "origin": "readonly",
-    "allow_set_hostname": 1,
+       "owner": "root",
-    "allow_socket_af": 0,
+       "pcpu": "off",
-    "allow_sysvipc": 0,
+       "plugin_name": "none",
-    "allow_tun": 0,
+       "plugin_repository": "none",
-    "allow_vmm": 0,
+       "priority": "99",
-    "assign_localhost": 0,
+       "pseudoterminals": "off",
-    "available": "readonly",
+       "quota": "none",
-    "basejail": 0,
+       "readbps": "off",
-    "boot": 0,
+       "readiops": "off",
-    "bpf": 0,
+       "reservation": "none",
-    "children_max": "0",
+       "resolver": "/etc/resolv.conf",
-    "comment": "none",
+       "rlimits": "off",
-    "compression": "lz4",
+       "rtsold": 0,
-    "compressratio": "readonly",
+       "securelevel": "2",
-    "coredumpsize": "off",
+       "shmsize": "off",
-    "count": "1",
+       "stacksize": "off",
-    "cpuset": "off",
+       "stop_timeout": "30",
-    "cputime": "off",
+       "swapuse": "off",
-    "datasize": "off",
+       "sync_state": "none",
-    "dedup": "off",
+       "sync_target": "none",
-    "defaultrouter": "auto",
+       "sync_tgt_zpool": "none",
-    "defaultrouter6": "auto",
+       "sysvmsg": "new",
-    "depends": "none",
+       "sysvsem": "new",
-    "devfs_ruleset": "4",
+       "sysvshm": "new",
-    "dhcp": 0,
+       "template": 0,
-    "enforce_statfs": "2",
+       "type": "jail",
-    "exec_clean": 1,
+       "used": "readonly",
-    "exec_created": "/usr/bin/true",
+       "vmemoryuse": "off",
-    "exec_fib": "0",
+       "vnet": 0,
-    "exec_jail_user": "root",
+       "vnet0_mac": "none",
-    "exec_poststart": "/usr/bin/true",
+       "vnet1_mac": "none",
-    "exec_poststop": "/usr/bin/true",
+       "vnet2_mac": "none",
-    "exec_prestart": "/usr/bin/true",
+       "vnet3_mac": "none",
-    "exec_prestop": "/usr/bin/true",
+       "vnet_default_interface": "auto",
-    "exec_start": "/bin/sh /etc/rc",
+       "vnet_interfaces": "none",
-    "exec_stop": "/bin/sh /etc/rc.shutdown",
+       "wallclock": "off",
-    "exec_system_jail_user": "0",
+       "writebps": "off",
-    "exec_system_user": "root",
+       "writeiops": "off"
-    "exec_timeout": "60",
+       }
    "host_domainname": "none",
    "host_time": 1,
    "hostid": "TO-BE-REPLACED-WITH-HOSTID",
    "hostid_strict_check": 0,
    "interfaces": "vnet0:TO-BE-REPLACED-WITH-BRIDGE",
    "ip4": "new",
    "ip4_addr": "none",
    "ip4_saddrsel": 1,
    "ip6": "new",
    "ip6_addr": "none",
    "ip6_saddrsel": 1,
    "ip_hostname": 0,
    "jail_zfs": 0,
    "jail_zfs_mountpoint": "none",
    "last_started": "none",
    "localhost_ip": "none",
    "login_flags": "-f root",
    "mac_prefix": "2c44fd",
    "maxproc": "off",
    "memorylocked": "off",
    "memoryuse": "off",
    "min_dyn_devfs_ruleset": "1000",
    "mount_devfs": 1,
    "mount_fdescfs": 1,
    "mount_linprocfs": 0,
    "mount_procfs": 0,
    "mountpoint": "readonly",
    "msgqqueued": "off",
    "msgqsize": "off",
    "nat": 0,
    "nat_backend": "ipfw",
    "nat_forwards": "none",
    "nat_interface": "none",
    "nat_prefix": "172.16",
    "nmsgq": "off",
    "notes": "none",
    "nsem": "off",
    "nsemop": "off",
    "nshm": "off",
    "nthr": "off",
    "openfiles": "off",
    "origin": "readonly",
    "owner": "root",
    "pcpu": "off",
    "plugin_name": "none",
    "plugin_repository": "none",
    "priority": "99",
    "pseudoterminals": "off",
    "quota": "none",
    "readbps": "off",
    "readiops": "off",
    "reservation": "none",
    "resolver": "/etc/resolv.conf",
    "rlimits": "off",
    "rtsold": 0,
    "securelevel": "2",
    "shmsize": "off",
    "stacksize": "off",
    "stop_timeout": "30",
    "swapuse": "off",
    "sync_state": "none",
    "sync_target": "none",
    "sync_tgt_zpool": "none",
    "sysvmsg": "new",
    "sysvsem": "new",
    "sysvshm": "new",
    "template": 0,
    "type": "jail",
    "used": "readonly",
    "vmemoryuse": "off",
    "vnet": 1,
    "vnet0_mac": "none",
    "vnet1_mac": "none",
    "vnet2_mac": "none",
    "vnet3_mac": "none",
    "vnet_default_interface": "auto",
    "vnet_interfaces": "none",
    "wallclock": "off",
    "writebps": "off",
    "writeiops": "off"
 }
 `
 )
@ -444,7 +362,7 @@ func executeCommand(cmdline string) (string, error) {
 		out, err = exec.Command(cmd[0]).CombinedOutput()
 	}
-	return strings.TrimSuffix(string(out), "\n"), err
+	return string(out), err
 }
 /* From iocage: 
@ -556,8 +474,6 @@ func executeCommandWithOutputToStdout(cmdline string) (error) {
 		word = word + string(c)
 	}
 	log.Debugf("executeCommandWithOutputToStdout: will execute \"%s\"\n", strings.Join(cmd, " "))
 	var execHandle *exec.Cmd
 	if len(cmd) > 1 {
 		execHandle = exec.Command(cmd[0], cmd[1:]...)
@ -752,30 +668,6 @@ func executeScript(script string) (string, error) {
 	return string(out), err
 }
 /*****************************************************************************
 *
 * Network related operations
 *
 *****************************************************************************/
 func getBridgeMembers(bridge string) ([]string, error) {
 	var members []string
 	cmd := fmt.Sprintf("/sbin/ifconfig %s", bridge)
 	out, err := executeCommand(cmd)
 	if err != nil {
 		return members, errors.New(fmt.Sprintf("%v; command returned \"%s\"", err, out))
 	}
 	for _, line := range strings.Split(out, "\n") {
 		if strings.HasPrefix(strings.TrimLeft(line, " \t"), "member:") {
 			m := strings.Split(strings.TrimLeft(strings.Split(line, ":")[1], " "), " ")[0]
 			log.Debugf("%s is member of %s\n", m, bridge)
 			members = append(members, m)
 		}
 	}
 	return members, nil
 }
 /*****************************************************************************
 *
 * ZFS datasets/pools operations
@ -898,20 +790,9 @@ func doZfsDatasetExist(dataset string) (bool, error) {
 	return true, nil
 }
-/* Create ZFS dataset
+// Create ZFS dataset. mountpoint can be "none", then the dataset won't be mounted
 * mountpoint can be "none", then the dataset won't be mounted
 * mountpoint can be "", then it will be inherited
 * compression can be "", then it wil be inherited
 */
 func zfsCreateDataset(dataset, mountpoint, compression string) error {
-	cmd := "zfs create"
+	cmd := fmt.Sprintf("zfs create -o mountpoint=%s -o compression=%s %s", mountpoint, compression, dataset)
 	if len(mountpoint) > 0 {
 		cmd = fmt.Sprintf("%s -o mountpoint=%s", cmd, mountpoint)
 	}
 	if len(compression) > 0 {
 		cmd = fmt.Sprintf("%s -o compression=%s", cmd, compression)
 	}
 	cmd = fmt.Sprintf("%s %s", cmd, dataset)
 	out, err := executeCommand(cmd)
 	if err != nil {
 		return errors.New(fmt.Sprintf("%v; command returned \"%s\"", err, out))
@ -920,9 +801,7 @@ func zfsCreateDataset(dataset, mountpoint, compression string) error {
 }
 // Return dataset name for a given mountpoint
 func zfsGetDatasetByMountpoint(mountpoint string) (string, error) {
-	// We dont want no recursivity
+	cmd := fmt.Sprintf("zfs list -p -r -H -o name %s", mountpoint)
 	//cmd := fmt.Sprintf("zfs list -p -r -H -o name %s", mountpoint)
 	cmd := fmt.Sprintf("zfs list -p -H -o name %s", mountpoint)
 	out, err := executeCommand(cmd)
 	if err != nil {
 		return "", errors.New(fmt.Sprintf("%v; command returned \"%s\"", err, out))
@ -942,11 +821,6 @@ func zfsDestroy(dataset string) error {
 	return nil
 }
 /*****************************************************************************
 *
 * Filesystem operations
 *
 *****************************************************************************/
 /* Copy file */
 func copyFile(src, dst string) error {
 	srcfinfo, err := os.Stat(src)
@ -971,22 +845,6 @@ func copyFile(src, dst string) error {
 	return err
 }
 // Get permissions of file or folder
 func getPermissions(path string) (os.FileInfo, error) {
 	return os.Stat(path)
 }
 func doFileExist(filePath string) (bool, error) {
 	if _, err := os.Stat(filePath); err != nil {
 		if errors.Is(err, os.ErrNotExist) {
 			return false, nil
 		} else {
 			return false, err
 		}
 	}
 	return true, nil
 }
 /*****************************************************************************
 *
 * rc.conf management
@ -1012,7 +870,7 @@ func disableRcKey(rcconfpath string, key string) error {
 			return err
 		}
 	}
-
+	
 	cmd = fmt.Sprintf("/usr/sbin/sysrc -f %s -x %s", rcconfpath, key)
 	_, err = executeCommand(cmd)
 	if err != nil {
@ -1021,44 +879,6 @@ func disableRcKey(rcconfpath string, key string) error {
 	return nil
 }
 // returns no error if rc key does not exist
 func getCurrentRcKeyValue(rcconfpath string, key string) (string, error) {
 	cmd := "/usr/sbin/sysrc -a"
 	kvs, err := executeCommand(cmd)
 	if err != nil {
 		return "", err
 	}
 	for _, kv := range strings.Split(string(kvs), "\n") {
 		fmt.Printf("%s\n", kv)
 		if strings.HasPrefix(kv, fmt.Sprintf("%s:", key)) {
 			return strings.TrimPrefix(strings.Join(strings.Split(kv, ":")[1:], ":"), " "), nil
 		}
 	}
 	return "", nil
 }
 // Add a value to current existing key value
 func addRcKeyValue(rcconfpath string, key string, value string) error {
 	var nv string
 	cv, err := getCurrentRcKeyValue(rcconfpath, key)
 	if err != nil {
 		return err
 	}
 	if len(cv) > 0 {
 		log.Debugf("Current value of %s: %s\n", key, cv)
 		nv = fmt.Sprintf("\"%s %s\"", cv, value)
 	} else {
 		nv = fmt.Sprintf("\"%s\"", value)
 	}
 	cmd := fmt.Sprintf("/usr/sbin/sysrc -f %s %s=%s", rcconfpath, key, nv)
 	_, err = executeCommand(cmd)
 	if err != nil {
 		return err
 	}
 	return nil
 }
 /*****************************************************************************
 * Parse an fstab file, returning an array of Mount
 *****************************************************************************/
@ -1074,8 +894,7 @@ func getFstab(path string) ([]Mount, error) {
 	scan := bufio.NewScanner(f)
 	for scan.Scan() {
 		res := strings.Fields(scan.Text())
-		// iocage create lines like that : "/iocage/releases/13.2-RELEASE/root/bin   /iocage/jails/smtp-router-02/root/bin   nullfs  ro      0       0 # Added by iocage on 2023-10-10 17:20:51"
+		if len(res) != 6 {
 		if (len(res) > 6 && !strings.EqualFold(res[6], "#")) || len(res) < 6 {
 			return mounts, fmt.Errorf("Incorrect format for fstab line %s", scan.Text())
 		}
 		freq, err := strconv.Atoi(res[4])
@ -1111,10 +930,13 @@ func getDevfsRuleset(ruleset int) []string {
 	if err != nil {
 		return []string{}
 	}
-	return strings.Split(out, "\n")[:len(strings.Split(out, "\n"))]
+	// Get rid of the last "\n"
 	return strings.Split(out, "\n")[:len(strings.Split(out, "\n"))-1]
 }
 func copyDevfsRuleset(ruleset int, srcrs int) error {
 	// Resulting ruleset as an array of line
 	//var result []string
 	out := getDevfsRuleset(srcrs)
 	for _, line := range out {
 		//fields := strings.Fields(line)
@ -1219,7 +1041,7 @@ func getJailFromArray(name string, jailtypes []string, jarray []Jail) (*Jail, er
 	var jails []Jail
 	if (len(jailtypes) == 1 && len(jailtypes[0]) == 0) || len(jailtypes) == 0 {
-		jailtypes = []string{"basejail", "jail", "template"}
+		jailtypes = []string{"jail", "basetpl"}
 	}
 	if strings.Contains(name, "/") {
@ -1285,55 +1107,16 @@ func setJailConfigUpdated(jail *Jail) error {
 	return nil
 }
 func freebsdVersionToStruct(rawVersion string) (FreeBSDVersion, error) {
 	var version FreeBSDVersion
 	var err error
 	regex := `([0-9]{1,2})(\.)?([0-9]{1,2})?\-([^\-]*)(\-)?(p[0-9]{1,2})?`
 	re := regexp.MustCompile(regex)
 	if re.MatchString(rawVersion) {
 		version.major, err = strconv.Atoi(re.FindStringSubmatch(rawVersion)[1])
 		if err != nil {
 			return version, err
 		}
 		version.minor, err = strconv.Atoi(re.FindStringSubmatch(rawVersion)[3])
 		if err != nil {
 			return version, err
 		}
 		version.flavor = strings.Trim(re.FindStringSubmatch(rawVersion)[4], "\n")
 		// Skip the 'p' starting patch level
 		if len(re.FindStringSubmatch(rawVersion)[6]) > 0 {
 			version.patchLevel, err = strconv.Atoi(re.FindStringSubmatch(rawVersion)[6][1:])
 			if err != nil {
 				return version, err
 			}
 		}
 	}
 	return version, nil
 }
 func getVersion(jail *Jail) (string, error) {
 	cvers, err := executeCommand(fmt.Sprintf("%s/bin/freebsd-version", jail.RootPath))
 	if err != nil {
 		fmt.Printf("ERROR: %s\n", err.Error())
 		return "", err
 	}
 	return strings.TrimRight(cvers, "\n"), nil
 }
 func updateVersion(jail *Jail) error {
-	cvers, err := executeCommand(fmt.Sprintf("%s/bin/freebsd-version", jail.RootPath))
+	cvers, err := executeCommandInJail(jail, "/bin/freebsd-version")
 	if err != nil {
 		fmt.Printf("ERROR: %s\n", err.Error())
 		return err
 	}
 	cvers = strings.TrimRight(cvers, "\n")
 	jail.Config.Release = cvers
-	jail.WriteConfigToDisk(false)
+	writeConfigToDisk(jail, false)
-
+	
 	return nil
 }
--- a/go.mod
+++ b/go.mod
@ -6,53 +6,26 @@ require (
 	github.com/c-robinson/iplib v1.0.3
 	github.com/c2h5oh/datasize v0.0.0-20220606134207-859f65c6625b
 	github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510
 	github.com/otiai10/copy v1.12.0
 	github.com/sirupsen/logrus v1.8.1
-	github.com/spf13/cobra v1.8.1
+	github.com/spf13/cobra v1.2.1
-	github.com/spf13/viper v1.19.0
+	github.com/spf13/viper v1.9.0
-	golang.org/x/net v0.25.0
+	golang.org/x/net v0.0.0-20210503060351-7fd8e65b6420
 )
 require (
-	github.com/bytedance/sonic v1.11.6 // indirect
+	github.com/fsnotify/fsnotify v1.5.1 // indirect
 	github.com/bytedance/sonic/loader v0.1.1 // indirect
 	github.com/cloudwego/base64x v0.1.4 // indirect
 	github.com/cloudwego/iasm v0.2.0 // indirect
 	github.com/fsnotify/fsnotify v1.7.0 // indirect
 	github.com/gabriel-vasile/mimetype v1.4.3 // indirect
 	github.com/gin-contrib/sse v0.1.0 // indirect
 	github.com/go-playground/locales v0.14.1 // indirect
 	github.com/go-playground/universal-translator v0.18.1 // indirect
 	github.com/go-playground/validator/v10 v10.20.0 // indirect
 	github.com/goccy/go-json v0.10.2 // indirect
 	github.com/hashicorp/hcl v1.0.0 // indirect
-	github.com/inconshreveable/mousetrap v1.1.0 // indirect
+	github.com/inconshreveable/mousetrap v1.0.0 // indirect
-	github.com/json-iterator/go v1.1.12 // indirect
+	github.com/magiconair/properties v1.8.5 // indirect
-	github.com/klauspost/cpuid/v2 v2.2.7 // indirect
+	github.com/mitchellh/mapstructure v1.4.2 // indirect
-	github.com/leodido/go-urn v1.4.0 // indirect
+	github.com/pelletier/go-toml v1.9.4 // indirect
-	github.com/magiconair/properties v1.8.7 // indirect
+	github.com/spf13/afero v1.6.0 // indirect
-	github.com/mattn/go-isatty v0.0.20 // indirect
+	github.com/spf13/cast v1.4.1 // indirect
-	github.com/mitchellh/mapstructure v1.5.0 // indirect
+	github.com/spf13/jwalterweatherman v1.1.0 // indirect
 	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
 	github.com/modern-go/reflect2 v1.0.2 // indirect
 	github.com/pelletier/go-toml/v2 v2.2.2 // indirect
 	github.com/sagikazarmark/locafero v0.4.0 // indirect
 	github.com/sagikazarmark/slog-shim v0.1.0 // indirect
 	github.com/sourcegraph/conc v0.3.0 // indirect
 	github.com/spf13/afero v1.11.0 // indirect
 	github.com/spf13/cast v1.6.0 // indirect
 	github.com/spf13/pflag v1.0.5 // indirect
-	github.com/subosito/gotenv v1.6.0 // indirect
+	github.com/subosito/gotenv v1.2.0 // indirect
-	github.com/twitchyliquid64/golang-asm v0.15.1 // indirect
+	golang.org/x/sys v0.0.0-20210823070655-63515b42dcdf // indirect
-	github.com/ugorji/go/codec v1.2.12 // indirect
+	golang.org/x/text v0.3.6 // indirect
-	go.uber.org/atomic v1.9.0 // indirect
+	gopkg.in/ini.v1 v1.63.2 // indirect
-	go.uber.org/multierr v1.9.0 // indirect
+	gopkg.in/yaml.v2 v2.4.0 // indirect
 	golang.org/x/arch v0.8.0 // indirect
 	golang.org/x/crypto v0.23.0 // indirect
 	golang.org/x/exp v0.0.0-20230905200255-921286631fa9 // indirect
 	golang.org/x/sys v0.20.0 // indirect
 	golang.org/x/text v0.15.0 // indirect
 	google.golang.org/protobuf v1.34.1 // indirect
 	gopkg.in/ini.v1 v1.67.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 )
--- a/gocage.conf.yml
+++ b/gocage.conf.yml
@ -5,9 +5,6 @@ datastore:
 # Prefix all commands with sudo
 sudo: false
 # Directory used to store update temporary files. Mutualized so we save bandwith
 updateWorkDir: /iocage/freebsd-updates
 # Columns to display when "gocage list". Column names are struct fields, see cmd/struct.go
 outcol: 'JID,Name,Config.Release,Config.Ip4_addr,Running'