Update README to reflect change in fetch flags and new -p flag for create

README.md

@@ -18,23 +18,17 @@ Create jails
 ------------
 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
+gocage create jail1 -r 13.2-RELEASE -p "Config.Ip4_addr='vnet0|192.168.1.91/24',Config.Ip6=none,Config.Boot=1"
-gocage set Config.Ip4_addr="vnet0|192.168.1.91/24" Config.Vnet=1 jail1
 </code></pre>
 
-Create basejail (jail based on a template, system will be nullfs read-only mounted from the template):
+Create basejail (jail based on a release, system will be nullfs read-only mounted from the release directory):
 <pre><code>
-# First create basetpl from 13.2-RELEASE, set it as a template
+gocage create -b -r 14.0-RELEASE basejail1
-gocage create -r 13.2-RELEASE basetpl
-gocage set Config.Jailtype="template" basetpl
-# Then create basejail1 based on basetpl
-gocage create -b basetpl basejail1
 </code></pre>
 
 
 List jails
 ----------
-Nothing fancy, just use  
 `gocage list`
 
 ### Specify fields to display
@@ -237,7 +231,7 @@ 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 -o iocage --from file:/iocage/download
+gocage fetch -r 12.3 -d iocage -f file:/iocage/download
 </pre></code>
 
 

TODO.md

@@ -1,8 +1,19 @@
 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  
 

cmd/create.go

@@ -16,6 +16,11 @@ 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}
 	}
@@ -39,7 +44,7 @@ func CreateJail(args []string) {
 
 		var ds *Datastore
 		if len(gCreateArgs.Datastore) > 0 {
-			fmt.Printf("DEBUG: Use %s datastore\n", gCreateArgs.Datastore)
+			log.Debugf("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())
@@ -50,21 +55,20 @@ func CreateJail(args []string) {
 		}
 
 		// Get base template if specified
-		if len(gCreateArgs.BaseTemplate) > 0 {
+		if gCreateArgs.BaseJail {
 			/**************************************************************************
 			*  Create based jail from a template
 			*/
-			log.Debugf("Jail will be created from a base template\n")
+			log.Debugf("Jail will be created read-only from release %s\n", gCreateArgs.Release)
-			bj, err := getJailFromArray(gCreateArgs.BaseTemplate, []string{"template"}, gJails)
+
-			if err != nil {
+			// First check if we got release on the same datastore
-				if strings.EqualFold(err.Error(), "Jail not found") {
+			releasePath := fmt.Sprintf("%s/releases/%s/root", ds.Mountpoint, gCreateArgs.Release)
-					fmt.Printf("Template not found\n")
+			_, err := os.Stat(releasePath)
-					return
+			if os.IsNotExist(err) {
-				} else {
+				fmt.Printf("ERROR: Release locally not available. Run \"gocage fetch\"\n")
-					fmt.Printf("ERROR: %s\n", err.Error())
+				return
-					return
-				}
 			}
+
 			// Create jail datasets
 			dstDset := fmt.Sprintf("%s/jails/%s", ds.ZFSDataset, jname)
 			fmt.Printf("    > Initialize dataset %s\n", dstDset)
@@ -87,7 +91,7 @@ func CreateJail(args []string) {
 			dstRootDir := fmt.Sprintf("%s/jails/%s/root", ds.Mountpoint, jname)
 			for _, d := range append(gBaseDirs, gEmptyDirs...) {
 				dstPath := dstRootDir
-				srcPath := bj.RootPath
+				srcPath := releasePath
 				for _, cd := range strings.Split(d, "/") {
 					srcPath = fmt.Sprintf("%s/%s", srcPath, cd)
 					dstPath = fmt.Sprintf("%s/%s", dstPath, cd)
@@ -110,9 +114,9 @@ func CreateJail(args []string) {
 			// Copy these from basejail
 			fmt.Printf("    > Create base writable directories\n")
 			for _, d := range gCopyDirs {
-				err := cp.Copy(fmt.Sprintf("%s/%s", bj.RootPath, d), fmt.Sprintf("%s/%s", dstRootDir, d))
+				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", bj.RootPath, d),
+					fmt.Printf("ERROR copying %s to %s: %s\n", fmt.Sprintf("%s/%s", releasePath, d),
 						   fmt.Sprintf("%s/%s", dstRootDir, d), err.Error())
 					return
 				}
@@ -150,7 +154,7 @@ func CreateJail(args []string) {
 			// 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 = bj.Name
+			j.Config.Origin = gCreateArgs.Release
 			j.Config.Host_hostname = jname
 			j.Config.Host_hostuuid = jname
 
@@ -166,7 +170,7 @@ func CreateJail(args []string) {
 			defer fstabHandle.Close()
 
 			for _, d := range gBaseDirs {
-				fmt.Fprintf(fstabHandle, "%s\t%s\tnullfs\tro\t0\t0\n", fmt.Sprintf("%s/%s", bj.RootPath, d), fmt.Sprintf("%s/%s", dstRootDir, d))
+				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")
@@ -268,7 +272,6 @@ func CreateJail(args []string) {
 			j.Config.Host_hostname = jname
 			j.Config.Host_hostuuid = jname
 			j.Config.Jailtype = "jail"
-						
 			j.WriteConfigToDisk(false)
 
 			///////////////////////////////////////////////////////////////////////
@@ -281,5 +284,17 @@ func CreateJail(args []string) {
 			defer fstabHandle.Close()
 			fmt.Printf("  > Jail created!\n")
 		}
+
+		var cmdline []string
+		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)
 	}
 }

cmd/freebsd-update.conf.go

@@ -1,85 +0,0 @@
-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
-	`
-) 

cmd/properties.go

@@ -1,8 +1,9 @@
 package cmd
 
 import (
-	"errors"
+	"os"
 	"fmt"
+	"errors"
 	"reflect"
 	"strconv"
 	"strings"
@@ -20,7 +21,7 @@ func GetJailProperties(args []string) {
 				jail, err = getJailFromArray(a, []string{""}, gJails)
 				if err != nil {
 					fmt.Printf("Error: %s\n", err.Error())
-					return
+					os.Exit(1)
 				}
 			} else {
 				props = append(props, a)
@@ -105,20 +106,20 @@ func SetJailProperties(args []string) {
 		return
 	}
 
-	// Get jail by index to modify it
+	cj, err := getJailFromArray(jail.Name, []string{""}, gJails)
-	for i, _ := range gJails {
+	if err != nil {
-		if gJails[i].Name == jail.Name {
+		fmt.Printf("Error getting jail %s: %v\n", jail.Name, err)
-			for _, p := range props {
+		return
-				err := setStructFieldValue(&gJails[i], p.name, p.value)
+	}
-				if err != nil {
+
-					fmt.Printf("Error: %s\n", err.Error())
+	for _, p := range props {
-					return
+		err := setStructFieldValue(cj, p.name, p.value)
-				} else {
+		if err != nil {
-					fmt.Printf("%s: %s set to %s\n", gJails[i].Name, p.name, p.value)
+			fmt.Printf("Error: %s\n", err.Error())
-					gJails[i].ConfigUpdated = true
+			return
-				}
+		} else {
-			}
+			fmt.Printf("%s: %s set to %s\n", cj.Name, p.name, p.value)
-			writeConfigToDisk(&gJails[i], false)
 		}
 	}
+	cj.WriteConfigToDisk(false)
 }

cmd/root.go

@@ -14,7 +14,7 @@ import (
 )
 
 const (
-	gVersion = "0.38"
+	gVersion = "0.42b"
 	
 	// TODO : Get from $jail_zpool/defaults.json
 	MIN_DYN_DEVFS_RULESET = 1000
@@ -22,9 +22,10 @@ const (
 
 type createArgs struct {
 	Release      string
-	BaseTemplate string
+	BaseJail     bool
 	Datastore    string
 	JailType     string
+	Properties   string
 }
 
 var (
@@ -56,6 +57,9 @@ var (
 
 	gTimeZone     string
 	gSnapshotName string
+	gZPool        string
+	gBridge       string
+	gInterface    string
 
 	gMigrateDestDatastore string
 	gYesToAll             bool
@@ -96,20 +100,14 @@ It support iocage jails and can coexist with iocage.`,
 			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) {
-			fv, _ := getFreeBSDVersion()
+			InitGoCage(args)
-			fmt.Printf("GoCage v.%s on FreeBSD %d.%d-%s\n", gVersion, fv.major, fv.minor, fv.flavor)
 		},
-	}*/
+	}
 
 	listCmd = &cobra.Command{
 		Use:   "list",
@@ -379,6 +377,11 @@ 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")
@@ -411,8 +414,8 @@ func init() {
 	migrateCmd.MarkFlagRequired("datastore")
 
 	fetchCmd.Flags().StringVarP(&gFetchRelease, "release", "r", "", "Release to fetch (e.g.: \"13.1-RELEASE\"")
-	fetchCmd.Flags().StringVarP(&gFetchIntoDS, "datastore", "o", "", "Datastore release will be saved to")
+	fetchCmd.Flags().StringVarP(&gFetchIntoDS, "datastore", "d", "", "Datastore release will be saved to")
-	fetchCmd.Flags().StringVarP(&gFetchFrom, "from", "d", "", "Repository to download from. Should contain XY.Z-RELEASE. File protocol supported")
+	fetchCmd.Flags().StringVarP(&gFetchFrom, "from", "f", "", "Repository to download from. Should contain XY.Z-RELEASE. File protocol supported")
 	fetchCmd.MarkFlagRequired("release")
 	fetchCmd.MarkFlagRequired("datastore")
 
@@ -420,10 +423,12 @@ func init() {
 	upgradeCmd.MarkFlagRequired("release")
 
 	createCmd.Flags().StringVarP(&gCreateArgs.Release, "release", "r", "", "Release for the jail (e.g.: \"13.1-RELEASE\"")
-	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().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.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)
 	listCmd.AddCommand(listPropsCmd)
@@ -441,7 +446,6 @@ func init() {
 	rootCmd.AddCommand(updateCmd)
 	rootCmd.AddCommand(upgradeCmd)
 	rootCmd.AddCommand(createCmd)
-	
 	rootCmd.AddCommand(testCmd)
 	
 	snapshotCmd.AddCommand(snapshotListCmd)
@@ -471,17 +475,6 @@ 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 {
@@ -515,12 +508,26 @@ func initConfig() {
 		fmt.Printf("More than 3 sort criteria is not supported!\n")
 		os.Exit(1)
 	}
-	
+
-	
 	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)
+	}
 }
 
 

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(jail.ConfigPath, "rtsold_enable", "yes")
+	err := enableRcKeyValue(fmt.Sprintf("%s/etc/rc.conf", jail.RootPath), "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,7 +810,9 @@ func generateMAC(jail *Jail, nic string) ([]byte, []byte, error) {
 	}
 	
 	hsmac := append(prefix, suffix...)
-	jsmac := append(hsmac[:5], hsmac[5]+1)
+	jsmac := make([]byte, 6)
+	copy(jsmac, hsmac)
+	jsmac[5] = jsmac[5] + 1
 	
 	// Save MACs to config
 	pname := fmt.Sprintf("Config.%s_mac", strings.Title(nic))
@@ -840,7 +842,7 @@ func setupVnetInterfaceHostSide(jail *Jail) ([]string, error) {
 		bridge := v[1]
 		
 		// Get host side MAC
-		pname := fmt.Sprintf("Config.%s_mac", nic)
+		pname := fmt.Sprintf("Config.%s_mac", strings.Title(nic))
 		var val *reflect.Value
 		val, pname, err = getStructFieldValue(jail, pname)
 		if err != nil {
@@ -853,13 +855,22 @@ func setupVnetInterfaceHostSide(jail *Jail) ([]string, error) {
 				return []string{}, err
 			}
 		} else {
-			hsmac = val.Bytes()
+			if strings.EqualFold(val.String(), "none") {
+				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 mtu: %v\n", err)
+			return []string{}, fmt.Errorf("Error getting bridge \"%s\" mtu: %v\n", bridge, err)
 		}
 		
 		// Create epair interface
@@ -909,7 +920,9 @@ func setupVnetInterfaceJailSide(jail *Jail, hostepairs []string) error {
 	
 	for _, i := range strings.Split(jail.Config.Ip4_addr, ",") {
 		v := strings.Split(i, "|")
-		ip4s[v[0]] = v[1]
+		if len(v) > 1 {
+			ip4s[v[0]] = v[1]
+		}
 	}
 	for _, i := range strings.Split(jail.Config.Ip6_addr, ",") {
 		v := strings.Split(i, "|")
@@ -934,7 +947,7 @@ func setupVnetInterfaceJailSide(jail *Jail, hostepairs []string) error {
 		jsepair := fmt.Sprintf("%sb", strings.TrimSuffix(hostepairs[i], "a"))
 
 		// Get jail side MAC
-		pname := fmt.Sprintf("Config.%s_mac", nic)
+		pname := fmt.Sprintf("Config.%s_mac", strings.Title(nic))
 		var val *reflect.Value
 		val, pname, err = getStructFieldValue(jail, pname)
 		if err != nil {
@@ -947,7 +960,11 @@ func setupVnetInterfaceJailSide(jail *Jail, hostepairs []string) error {
 				return err
 			}
 		} else {
-			jsmac = val.Bytes()
+			jsmac, err = hex.DecodeString(strings.Split(val.String(), " ")[1])
+                        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)
@@ -959,7 +976,7 @@ 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)
@@ -1431,7 +1448,7 @@ func StartJail(args []string) {
 		fmt.Printf("  > Setup VNet network: OK\n")
 		
 		// Set default route, unless main network is dhcp
-		if ! cj.isFirstNetDhcp() {
+		if ! cj.isFirstNetDhcp() && !strings.EqualFold(cj.Config.Ip4_addr, "none") {
 			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)

cmd/stop.go

@@ -83,15 +83,30 @@ func umountAndUnjailZFS(jail *Jail) error {
 }
 
 func destroyVNetInterfaces(jail *Jail) error {
-	for _, i := range strings.Split(jail.Config.Ip4_addr, ",") {
+	if !strings.EqualFold(jail.Config.Ip4_addr, "none") {
-		iname := fmt.Sprintf("%s.%d", strings.Split(i, "|")[0], jail.JID)
+		for _, i := range strings.Split(jail.Config.Ip4_addr, ",") {
-		fmt.Printf("%s: ", iname)
+			iname := fmt.Sprintf("%s.%d", strings.Split(i, "|")[0], jail.JID)
-		_, err := executeCommand(fmt.Sprintf("ifconfig %s destroy", iname))
+			fmt.Printf("%s: ", iname)
-		//_, err := executeScript(fmt.Sprintf("ifconfig %s destroy >/dev/null 2>&1", iname))
+			_, err := executeCommand(fmt.Sprintf("ifconfig %s destroy", iname))
-		if err != nil {
+			//_, err := executeScript(fmt.Sprintf("ifconfig %s destroy >/dev/null 2>&1", iname))
-			return err
+			if err != nil {
-		} else {
+				return err
-			fmt.Printf("OK\n")
+			} else {
+				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")
+			}
 		}
 	}
 

cmd/update.go

@@ -5,6 +5,7 @@ import (
 	"fmt"
 	//"log"
 	"time"
+	"strings"
 )
 
 
@@ -62,7 +63,13 @@ 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()

cmd/utils.go

@@ -24,140 +24,221 @@ const (
 	ifconfigipv4re = `inet[[:space:]](` + ipv4re + `)`
 	// Maximum thread qty for start/stop
 	gMaxThreads    = 4
-	
+
-	gDefaultsJson = ` {
+	fbsdUpdateConfig = `# $FreeBSD$
-       "CONFIG_VERSION": "27",
+
-       "allow_chflags": 0,
+# Trusted keyprint.  Changing this is a Bad Idea unless you've received
-       "allow_mlock": 0,
+# a PGP-signed email from <security-officer@FreeBSD.org> telling you to
-       "allow_mount": 0,
+# change it and explaining why.
-       "allow_mount_devfs": 0,
+KeyPrint 800651ef4b4c71c27e60786d7b487188970f4b4169cc055784e21eb71d410cc5
-       "allow_mount_fusefs": 0,
+
-       "allow_mount_nullfs": 0,
+# Server or server pool from which to fetch updates.  You can change
-       "allow_mount_procfs": 0,
+# this to point at a specific server if you want, but in most cases
-       "allow_mount_tmpfs": 0,
+# using a "nearby" server won't provide a measurable improvement in
-       "allow_mount_zfs": 0,
+# performance.
-       "allow_quotas": 0,
+ServerName update.FreeBSD.org
-       "allow_raw_sockets": 0,
+
-       "allow_set_hostname": 1,
+# Components of the base system which should be kept updated.
-       "allow_socket_af": 0,
+Components world
-       "allow_sysvipc": 0,
+
-       "allow_tun": 0,
+# Example for updating the userland and the kernel source code only:
-       "allow_vmm": 0,
+# Components src/base src/sys world
-       "assign_localhost": 0,
+
-       "available": "readonly",
+# Paths which start with anything matching an entry in an IgnorePaths
-       "basejail": 0,
+# statement will be ignored.
-       "boot": 0,
+IgnorePaths
-       "bpf": 0,
+
-       "children_max": "0",
+# Paths which start with anything matching an entry in an IDSIgnorePaths
-       "comment": "none",
+# statement will be ignored by "freebsd-update IDS".
-       "compression": "lz4",
+IDSIgnorePaths /usr/share/man/cat
-       "compressratio": "readonly",
+IDSIgnorePaths /usr/share/man/whatis
-       "coredumpsize": "off",
+IDSIgnorePaths /var/db/locate.database
-       "count": "1",
+IDSIgnorePaths /var/log
-       "cpuset": "off",
+
-       "cputime": "off",
+# Paths which start with anything matching an entry in an UpdateIfUnmodified
-       "datasize": "off",
+# statement will only be updated if the contents of the file have not been
-       "dedup": "off",
+# modified by the user (unless changes are merged; see below).
-       "defaultrouter": "auto",
+UpdateIfUnmodified /etc/ /var/ /root/ /.cshrc /.profile
-       "defaultrouter6": "auto",
+
-       "depends": "none",
+# When upgrading to a new FreeBSD release, files which match MergeChanges
-       "devfs_ruleset": "4",
+# will have any local changes merged into the version from the new release.
-       "dhcp": 0,
+MergeChanges /etc/
-       "enforce_statfs": "2",
+
-       "exec_clean": 1,
+### Default configuration options:
-       "exec_created": "/usr/bin/true",
+
-       "exec_fib": "0",
+# Directory in which to store downloaded updates and temporary
-       "exec_jail_user": "root",
+# files used by FreeBSD Update.
-       "exec_poststart": "/usr/bin/true",
+WorkDir /iocage/freebsd-update
-       "exec_poststop": "/usr/bin/true",
+
-       "exec_prestart": "/usr/bin/true",
+# Destination to send output of "freebsd-update cron" if an error
-       "exec_prestop": "/usr/bin/true",
+# occurs or updates have been downloaded.
-       "exec_start": "/bin/sh /etc/rc",
+# MailTo root
-       "exec_stop": "/bin/sh /etc/rc.shutdown",
+
-       "exec_system_jail_user": "0",
+# Is FreeBSD Update allowed to create new files?
-       "exec_system_user": "root",
+# AllowAdd yes
-       "exec_timeout": "60",
+
-       "host_domainname": "none",
+# Is FreeBSD Update allowed to delete files?
-       "host_time": 1,
+# AllowDelete yes
-       "hostid": "36353536-3135-5a43-4a34-313130315a56",
+
-       "hostid_strict_check": 0,
+# If the user has modified file ownership, permissions, or flags, should
-       "interfaces": "vnet0:bridge0",
+# FreeBSD Update retain this modified metadata when installing a new version
-       "ip4": "new",
+# of that file?
-       "ip4_addr": "none",
+# KeepModifiedMetadata yes
-       "ip4_saddrsel": 1,
+
-       "ip6": "new",
+# When upgrading between releases, should the list of Components be
-       "ip6_addr": "none",
+# read strictly (StrictComponents yes) or merely as a list of components
-       "ip6_saddrsel": 1,
+# which *might* be installed of which FreeBSD Update should figure out
-       "ip_hostname": 0,
+# which actually are installed and upgrade those (StrictComponents no)?
-       "jail_zfs": 0,
+StrictComponents yes
-       "jail_zfs_mountpoint": "none",
+
-       "last_started": "none",
+# When installing a new kernel perform a backup of the old one first
-       "localhost_ip": "none",
+# so it is possible to boot the old kernel in case of problems.
-       "login_flags": "-f root",
+BackupKernel no
-       "mac_prefix": "2c44fd",
+
-       "maxproc": "off",
+# If BackupKernel is enabled, the backup kernel is saved to this
-       "memorylocked": "off",
+# directory.
-       "memoryuse": "off",
+# BackupKernelDir /boot/kernel.old
-       "min_dyn_devfs_ruleset": "1000",
+
-       "mount_devfs": 1,
+# When backing up a kernel also back up debug symbol files?
-       "mount_fdescfs": 1,
+BackupKernelSymbolFiles no
-       "mount_linprocfs": 0,
+
-       "mount_procfs": 0,
+# Create a new boot environment when installing patches
-       "mountpoint": "readonly",
+CreateBootEnv no
-       "msgqqueued": "off",
+`
-       "msgqsize": "off",
+
-       "nat": 0,
+	gDefaultsJson = `{
-       "nat_backend": "ipfw",
+    "CONFIG_VERSION": "27",
-       "nat_forwards": "none",
+    "allow_chflags": 0,
-       "nat_interface": "none",
+    "allow_mlock": 0,
-       "nat_prefix": "172.16",
+    "allow_mount": 0,
-       "nmsgq": "off",
+    "allow_mount_devfs": 0,
-       "notes": "none",
+    "allow_mount_fusefs": 0,
-       "nsem": "off",
+    "allow_mount_nullfs": 0,
-       "nsemop": "off",
+    "allow_mount_procfs": 0,
-       "nshm": "off",
+    "allow_mount_tmpfs": 0,
-       "nthr": "off",
+    "allow_mount_zfs": 0,
-       "openfiles": "off",
+    "allow_quotas": 0,
-       "origin": "readonly",
+    "allow_raw_sockets": 0,
-       "owner": "root",
+    "allow_set_hostname": 1,
-       "pcpu": "off",
+    "allow_socket_af": 0,
-       "plugin_name": "none",
+    "allow_sysvipc": 0,
-       "plugin_repository": "none",
+    "allow_tun": 0,
-       "priority": "99",
+    "allow_vmm": 0,
-       "pseudoterminals": "off",
+    "assign_localhost": 0,
-       "quota": "none",
+    "available": "readonly",
-       "readbps": "off",
+    "basejail": 0,
-       "readiops": "off",
+    "boot": 0,
-       "reservation": "none",
+    "bpf": 0,
-       "resolver": "/etc/resolv.conf",
+    "children_max": "0",
-       "rlimits": "off",
+    "comment": "none",
-       "rtsold": 0,
+    "compression": "lz4",
-       "securelevel": "2",
+    "compressratio": "readonly",
-       "shmsize": "off",
+    "coredumpsize": "off",
-       "stacksize": "off",
+    "count": "1",
-       "stop_timeout": "30",
+    "cpuset": "off",
-       "swapuse": "off",
+    "cputime": "off",
-       "sync_state": "none",
+    "datasize": "off",
-       "sync_target": "none",
+    "dedup": "off",
-       "sync_tgt_zpool": "none",
+    "defaultrouter": "auto",
-       "sysvmsg": "new",
+    "defaultrouter6": "auto",
-       "sysvsem": "new",
+    "depends": "none",
-       "sysvshm": "new",
+    "devfs_ruleset": "4",
-       "template": 0,
+    "dhcp": 0,
-       "type": "jail",
+    "enforce_statfs": "2",
-       "used": "readonly",
+    "exec_clean": 1,
-       "vmemoryuse": "off",
+    "exec_created": "/usr/bin/true",
-       "vnet": 0,
+    "exec_fib": "0",
-       "vnet0_mac": "none",
+    "exec_jail_user": "root",
-       "vnet1_mac": "none",
+    "exec_poststart": "/usr/bin/true",
-       "vnet2_mac": "none",
+    "exec_poststop": "/usr/bin/true",
-       "vnet3_mac": "none",
+    "exec_prestart": "/usr/bin/true",
-       "vnet_default_interface": "auto",
+    "exec_prestop": "/usr/bin/true",
-       "vnet_interfaces": "none",
+    "exec_start": "/bin/sh /etc/rc",
-       "wallclock": "off",
+    "exec_stop": "/bin/sh /etc/rc.shutdown",
-       "writebps": "off",
+    "exec_system_jail_user": "0",
-       "writeiops": "off"
+    "exec_system_user": "root",
-       }
+    "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"
+}
 `
 )
 
@@ -362,7 +443,7 @@ func executeCommand(cmdline string) (string, error) {
 		out, err = exec.Command(cmd[0]).CombinedOutput()
 	}
 
-	return string(out), err
+	return strings.TrimSuffix(string(out), "\n"), err
 }
 
 /* From iocage: 
@@ -670,6 +751,30 @@ 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
@@ -814,7 +919,9 @@ func zfsCreateDataset(dataset, mountpoint, compression string) error {
 }
 // Return dataset name for a given mountpoint
 func zfsGetDatasetByMountpoint(mountpoint string) (string, error) {
-	cmd := fmt.Sprintf("zfs list -p -r -H -o name %s", mountpoint)
+	// We dont want no recursivity
+	//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))
@@ -868,6 +975,17 @@ 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
@@ -893,7 +1011,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 {
@@ -902,6 +1020,44 @@ 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
 *****************************************************************************/
@@ -917,7 +1073,8 @@ func getFstab(path string) ([]Mount, error) {
 	scan := bufio.NewScanner(f)
 	for scan.Scan() {
 		res := strings.Fields(scan.Text())
-		if len(res) != 6 {
+		// 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 && !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])

go.mod

@@ -8,25 +8,51 @@ require (
 	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.2.1
+	github.com/spf13/cobra v1.8.1
-	github.com/spf13/viper v1.9.0
+	github.com/spf13/viper v1.19.0
-	golang.org/x/net v0.0.0-20210503060351-7fd8e65b6420
+	golang.org/x/net v0.25.0
 )
 
 require (
-	github.com/fsnotify/fsnotify v1.5.1 // indirect
+	github.com/bytedance/sonic v1.11.6 // 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.0.0 // indirect
+	github.com/inconshreveable/mousetrap v1.1.0 // indirect
-	github.com/magiconair/properties v1.8.5 // indirect
+	github.com/json-iterator/go v1.1.12 // indirect
-	github.com/mitchellh/mapstructure v1.4.2 // indirect
+	github.com/klauspost/cpuid/v2 v2.2.7 // indirect
-	github.com/pelletier/go-toml v1.9.4 // indirect
+	github.com/leodido/go-urn v1.4.0 // indirect
-	github.com/spf13/afero v1.6.0 // indirect
+	github.com/magiconair/properties v1.8.7 // indirect
-	github.com/spf13/cast v1.4.1 // indirect
+	github.com/mattn/go-isatty v0.0.20 // indirect
-	github.com/spf13/jwalterweatherman v1.1.0 // indirect
+	github.com/mitchellh/mapstructure v1.5.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.2.0 // indirect
+	github.com/subosito/gotenv v1.6.0 // indirect
-	golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8 // indirect
+	github.com/twitchyliquid64/golang-asm v0.15.1 // indirect
-	golang.org/x/text v0.3.6 // indirect
+	github.com/ugorji/go/codec v1.2.12 // indirect
-	gopkg.in/ini.v1 v1.63.2 // indirect
+	go.uber.org/atomic v1.9.0 // indirect
-	gopkg.in/yaml.v2 v2.4.0 // indirect
+	go.uber.org/multierr v1.9.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
 )