v0.36a: Add upgrade command

CHANGELOG

@@ -1,3 +1,4 @@
 v.0.33b : Support jailing datasets on differents pools : jail_zfs_dataset now have to include the pool name  
 v.0.33c : Parallelize start/stop of jails with same priority  
 v.0.34 : jail name can be shortened 
+v.0.35 : One can now "gocage destroy"

README.md

@@ -126,6 +126,17 @@ Stop jails
 `gocage stop test`
 
 
+Update jails  
+----------
+To update jail patch version, use gocage update :  
+`gocage update test`
+
+
+Delete jails  
+----------
+`gocage destroy test`
+
+
 Multi datastore  
 ----------
 A datastore is a ZFS dataset mounted. It should be declared in gocage.conf.yml, specifying its ZFS mountpoint :
@@ -206,9 +217,7 @@ gocage fetch -r 12.3 -o iocage --from file:/iocage/download
 
 TODO
 ----------
-gocage update  
 gocage upgrade  
 gocage create  
-gocage destroy  
 gocage init  
   create default pool with defaults.json

cmd/console.go

@@ -33,7 +33,6 @@ func shellJail(jail *Jail) error {
 
 	jid := strconv.Itoa(jail.JID)
 
-	//err := syscall.Exec("/usr/sbin/jexec", []string{"jexec", jid, "/bin/csh"}, os.Environ())
 	err := syscall.Exec("/usr/sbin/jexec", []string{"jexec", jid, "login", "-f", "root"}, os.Environ())
 
 	// We should never get here, as syscall.Exec replace the gocage binary execution with jexec

cmd/destroy.go

@@ -0,0 +1,57 @@
+package cmd
+
+import (
+	"fmt"
+	//"log"
+	//"errors"
+	"strings"
+)
+
+func DestroyJails(args []string) {
+	for _, a := range args {
+		cj, err := getJailFromArray(a, gJails)
+		if err != nil {
+			fmt.Printf("Error getting jail: %s\n", err)
+			return
+		}
+		
+		if cj.Running == true {
+			fmt.Printf("Jail %s is running\n", cj.Name)
+			if gForce == false {
+				var answer string
+				fmt.Printf("Stop jail and delete? (y/n) ")
+				fmt.Scanln(&answer)
+				if false == strings.EqualFold(answer, "y") {
+					return
+				}
+			}
+			fmt.Printf("Stopping jail %s\n", cj.Name)
+			StopJail([]string{fmt.Sprintf("%s/%s", cj.Datastore, cj.Name)})
+		}
+		
+		// Get root and config datasets, then destroy
+		dsRootName, err := zfsGetDatasetByMountpoint(cj.RootPath)
+		if err != nil {
+			fmt.Printf("Error getting root dataset: %s\n", err)
+			return
+		}
+		//fmt.Printf("DEBUG: Prepare to zfs destroy %s\n", dsRootName)
+		if err = zfsDestroy(dsRootName); err != nil {
+			fmt.Printf("Error deleting root dataset: %s\n", err)
+			return
+		}
+		
+		dsConfName, err := zfsGetDatasetByMountpoint(cj.ConfigPath)
+		if err != nil {
+			fmt.Printf("Error getting config dataset: %s\n", err)
+			return
+		}
+		//fmt.Printf("DEBUG: Prepare to zfs destroy %s\n", dsConfName)
+		if err = zfsDestroy(dsConfName); err != nil {
+			fmt.Printf("Error deleting config dataset: %s\n", err)
+			return
+		}
+
+		//TODO: Delete jail named directory
+	}
+}

cmd/fetch.go

@@ -61,7 +61,7 @@ func fetchRelease(release string, proto string, arch string, datastore string, f
 	}
 	if false == exist {
 		// Then create dataset
-		if err := createZfsDataset(downloadDsName, downloadDsMountPoint, "lz4"); err != nil {
+		if err := zfsCreateDataset(downloadDsName, downloadDsMountPoint, "lz4"); err != nil {
 			return fmt.Errorf("Error creating dataset %s: %v\n", downloadDsName, err)
 		}
 	}
@@ -75,7 +75,7 @@ func fetchRelease(release string, proto string, arch string, datastore string, f
 	}
 	if false == exist {
 		// Then create dataset
-		if err := createZfsDataset(thisDownloadDsName, thisDownloadDsMountPoint, "lz4"); err != nil {
+		if err := zfsCreateDataset(thisDownloadDsName, thisDownloadDsMountPoint, "lz4"); err != nil {
 			return fmt.Errorf("Error creating dataset %s: %v\n", thisDownloadDsName, err)
 		}
 	}
@@ -147,7 +147,7 @@ func extractRelease(release string, datastore string) {
 	}
 	if false == exist {
 		// Then create dataset
-		if err := createZfsDataset(releaseDsName, releaseDsMountPoint, "lz4"); err != nil {
+		if err := zfsCreateDataset(releaseDsName, releaseDsMountPoint, "lz4"); err != nil {
 			fmt.Printf("Error creating dataset %s: %v\n", releaseDsName, err)
 			return
 		}
@@ -163,7 +163,7 @@ func extractRelease(release string, datastore string) {
 	}
 	if false == exist {
 		// Then create dataset
-		if err := createZfsDataset(thisReleaseDsName, thisReleaseDsMountPoint, "lz4"); err != nil {
+		if err := zfsCreateDataset(thisReleaseDsName, thisReleaseDsMountPoint, "lz4"); err != nil {
 			fmt.Printf("Error creating dataset %s: %v\n", thisReleaseDsName, err)
 			return
 		}
@@ -179,7 +179,7 @@ func extractRelease(release string, datastore string) {
 	}
 	if false == exist {
 		// Then create dataset
-		if err := createZfsDataset(thisReleaseRootDsName, thisReleaseRootDsMountPoint, "lz4"); err != nil {
+		if err := zfsCreateDataset(thisReleaseRootDsName, thisReleaseRootDsMountPoint, "lz4"); err != nil {
 			fmt.Printf("Error creating dataset %s: %v\n", thisReleaseRootDsName, err)
 			return
 		}

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
+	`
+) 

cmd/root.go

@@ -15,7 +15,7 @@ import (
 )
 
 const (
-	gVersion = "0.34"
+	gVersion = "0.36a"
 	
 	// TODO : Get from $jail_zpool/defaults.json
 	MIN_DYN_DEVFS_RULESET = 1000
@@ -55,6 +55,7 @@ var (
 	gFetchRelease    string
 	gFetchIntoDS     string
 	gFetchFrom       string
+	gUpgradeRelease  string
 
 	gMdevfs          sync.Mutex
 
@@ -100,7 +101,7 @@ ex: gocage list srv-db srv-web`,
 		},
 	}
 
-/*	destroyCmd = &cobra.Command{
+	destroyCmd = &cobra.Command{
 		Use:   "destroy",
 		Short: "destroy jails",
 		Long: `Destroy jail filesystem, snapshots and configuration file.`,
@@ -109,7 +110,7 @@ ex: gocage list srv-db srv-web`,
 			DestroyJails(args)
 		},
 	}
-*/
+
 	stopCmd = &cobra.Command{
 		Use:   "stop",
 		Short: "stop jail",
@@ -140,8 +141,6 @@ ex: gocage list srv-db srv-web`,
 		},
 	}
 
-	
-	
 	restartCmd = &cobra.Command{
 		Use:   "restart",
 		Short: "restart jail",
@@ -305,7 +304,7 @@ You can specify multiple datastores.`,
 		},
 	}
 
-	UpdateCmd = &cobra.Command{
+	updateCmd = &cobra.Command{
 		Use:   "update",
 		Short: "Update FreeBSD release",
 		Run: func(cmd *cobra.Command, args []string) {
@@ -314,6 +313,15 @@ You can specify multiple datastores.`,
 		},
 	}
 
+	upgradeCmd = &cobra.Command{
+		Use:   "upgrade",
+		Short: "Upgrade FreeBSD release",
+		Run: func(cmd *cobra.Command, args []string) {
+			ListJails(args, false)
+			UpgradeJail(args)
+		},
+	}
+
 	testCmd = &cobra.Command{
 		Use:   "test",
 		Short: "temporary command to test some code snippet",
@@ -343,7 +351,7 @@ func init() {
 	listCmd.Flags().StringVarP(&gFilterJails, "filter", "f", "none", "Only display jails with these values. Ex: \"gocage list -f Config.Boot=1\" will only list started on boot jails")
 	listCmd.Flags().StringVarP(&gSortJailFields, "sort", "s", "none", "Display jails sorted by field values. Ex: \"gocage list -s +Name,-Config.Priority\" will sort jails by their decreasing name, then increasing start priority. 3 critera max supported.")
 	
-//	destroyCmd.Flags().BoolVarP(&gForce, "force", "f", false, "Force stop jail if running")
+	destroyCmd.Flags().BoolVarP(&gForce, "force", "f", false, "Force stop jail if running")
 
 	snapshotListCmd.Flags().StringVarP(&gDisplaySColumns, "outcol", "o", "Jailname,Name,Creation,Referenced,Used", "Show these columns in output")
 	snapshotListCmd.Flags().BoolVarP(&gNoSnapLineSep, "nolinesep", "l", false, "Do not display line separator between snapshots")
@@ -373,6 +381,8 @@ func init() {
 	fetchCmd.MarkFlagRequired("release")
 	fetchCmd.MarkFlagRequired("datastore")
 	
+	upgradeCmd.Flags().StringVarP(&gUpgradeRelease, "release", "r", "", "Release to upgrade to (e.g.: \"13.1-RELEASE\"")
+	upgradeCmd.MarkFlagRequired("release")
 
 	// Now declare commands
 	rootCmd.AddCommand(versionCmd)
@@ -381,7 +391,7 @@ func init() {
 	rootCmd.AddCommand(stopCmd)
 	rootCmd.AddCommand(startCmd)
 	rootCmd.AddCommand(restartCmd)
-//	rootCmd.AddCommand(destroyCmd)
+	rootCmd.AddCommand(destroyCmd)
 	rootCmd.AddCommand(shellCmd)
 	rootCmd.AddCommand(getCmd)
 	rootCmd.AddCommand(setCmd)
@@ -389,7 +399,8 @@ func init() {
 	rootCmd.AddCommand(migrateCmd)
 	rootCmd.AddCommand(datastoreCmd)
 	rootCmd.AddCommand(fetchCmd)
-	rootCmd.AddCommand(UpdateCmd)
+	rootCmd.AddCommand(updateCmd)
+	rootCmd.AddCommand(upgradeCmd)
 	
 	rootCmd.AddCommand(testCmd)
 	
@@ -522,6 +533,8 @@ func WriteConfigToDisk(jailName string, changeauto bool, forceWrite bool) {
 				
 				//fmt.Printf("DEBUG: Will write config to disk, with content:\n")
 				//fmt.Printf(string(marshaled))
+				fmt.Printf("DEBUG: Will write config to disk, Config.Release=%s\n", jc.Release)
+				fmt.Printf("DEBUG: Will write config to disk, Config.Last_started=%s\n", jc.Last_started)
 				
 				if os.WriteFile(j.ConfigPath, []byte(marshaled), 0644); err != nil {
 					fmt.Printf("Error writing config file %s: %v\n", j.ConfigPath, err)

cmd/start.go

@@ -1176,7 +1176,7 @@ func StartJail(args []string) {
 			continue
 		}
 		
-		fmt.Printf("> Starting jail %s\n", a)
+		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)

cmd/stop.go

@@ -281,7 +281,7 @@ func StopJail(args []string) {
 			continue
 		}
 
-		fmt.Printf("> Stopping jail %s\n", a)
+		fmt.Printf("> Stopping jail %s\n", cj.Name)
 
 		// Get current version to update config.json
 		cvers, err := executeCommandInJail(cj, "/bin/freebsd-version")
@@ -297,7 +297,7 @@ func StopJail(args []string) {
 		
 		// This is working in this context, but value is not available in WriteConfigToDisk context :/
 		setStructFieldValue(cj, "Config.Release", cvers)
-		fmt.Printf("DEBUG: release was set, now is : %s\n", cj.Config.Release)
+		//fmt.Printf("DEBUG: release was set, now is : %s\n", cj.Config.Release)
 		
 		// We need to get the real Config object, not a copy of it		
 
@@ -465,7 +465,7 @@ func StopJail(args []string) {
 			}
 		}
 
-		fmt.Printf("DEBUG: release = %s\n", cj.Config.Release)
+		//fmt.Printf("DEBUG: release = %s\n", cj.Config.Release)
 		WriteConfigToDisk(cj.Name, false, true)
 
 	}

cmd/update.go

@@ -7,93 +7,9 @@ import (
 	"time"
 )
 
-const (
-	fbsdUpdateConfig = `
-	# $FreeBSD: releng/12.2/usr.sbin/freebsd-update/freebsd-update.conf 337338 2018-08-04 22:25:41Z brd $
-	
-	# 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 /var/db/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 no
-	
-	# 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 yes
-	
-	# 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 yes
-	`
-)
 
 // Internal usage only
 func updateJail(jail *Jail) error {
-	
 	// Create default config as temporary file
 	cfgFile, err := os.CreateTemp("", "gocage-jail-update-")
 	if err != nil {
@@ -103,20 +19,28 @@ func updateJail(jail *Jail) error {
 	cfgFile.Write([]byte(fbsdUpdateConfig))
 
 	defer cfgFile.Close()
-	//defer os.Remove(cfgFile.Name())
+	defer os.Remove(cfgFile.Name())
+
+	// 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)
+	//fmt.Printf("DEBUG: Prepare to execute \"%s\"\n", cmd)
 
 	err = executeCommandWithOutputToStdout(cmd)
 	if err != nil {
 		return err
 	}
 
-	// Get and write new release into config.json
-	
+	// TODO : Get and write new release into config.json
 
 	return nil
 }

cmd/upgrade.go

@@ -0,0 +1,124 @@
+package cmd
+
+
+
+import (
+	"os"
+	"fmt"
+	//"log"
+	"time"
+	"strings"
+)
+
+// Internal usage only
+func upgradeJail(jail *Jail, version string) error {
+	// Create default config as temporary file
+	cfgFile, err := os.CreateTemp("", "gocage-jail-upgrade-")
+	if err != nil {
+		return err
+	}
+
+	cfgFile.Write([]byte(fbsdUpdateConfig))
+
+	defer cfgFile.Close()
+	defer os.Remove(cfgFile.Name())
+
+	// 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
+		}
+	}
+
+	// Get current version. Won't work on stopped jail.
+	fbsdvers, err := executeCommandInJail(jail, "/bin/freebsd-version")
+	if err != nil {
+		fmt.Printf("ERROR executeCommandInJail: %s\n", err.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)
+
+	//fmt.Printf("DEBUG: Prepare to execute \"%s\"\n", cmd)
+
+	// Need to give user control, bc there could be merge edit needs
+	err = executeCommandWithStdinStdoutStderr(cmd)
+	if err != nil {
+		return err
+	}
+
+	cmd = fmt.Sprintf("/usr/sbin/freebsd-update -f %s -b %s --currently-running %s -r %s install", 
+			   cfgFile.Name(), jail.RootPath, fbsdvers, version)
+
+	//fmt.Printf("DEBUG: Prepare to execute \"%s\"\n", cmd)
+
+	err = executeCommandWithStdinStdoutStderr(cmd)
+	if err != nil {
+		return err
+	}
+
+	cmd = fmt.Sprintf("/usr/sbin/freebsd-update -f %s -b %s --currently-running %s -r %s install", 
+			  cfgFile.Name(), jail.RootPath, fbsdvers, version)
+
+	//fmt.Printf("DEBUG: Prepare to execute \"%s\"\n", cmd)
+
+	err = executeCommandWithStdinStdoutStderr(cmd)
+	if err != nil {
+		return err
+	}
+
+	cmd = fmt.Sprintf("/usr/local/sbin/pkg-static -j %d install -q -f -y pkg", jail.JID)
+	err = executeCommandWithStdinStdoutStderr(cmd)
+	if err != nil {
+		return err
+	}
+
+	// Get and write new release into config.json
+
+	return nil
+}
+
+func UpgradeJail(args []string) {
+	// Current jail were stopping
+	var cj *Jail
+	var err error
+
+	for _, a := range args {
+		// Check if jail exist and is distinctly named
+		cj, err = getJailFromArray(a, gJails)
+		if err != nil {
+			fmt.Printf("Error getting jail: %s\n", err)
+			continue
+		}
+
+		if cj.Running == false {
+			fmt.Printf("Error: jail must be running for upgrade.\n")
+			return
+		}
+
+		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("goc_upgrade_%s_%s", cj.Config.Release, curDate)
+		err := createJailSnapshot(*cj)
+		if err != nil {
+			fmt.Printf("  > Snapshot jail %s: ERROR: %s\n", cj.Name, err.Error())
+			return
+		}
+		fmt.Printf("  > Snapshot jail %s: OK\n", cj.Name)
+
+		fmt.Printf("  > Upgrade jail %s to %s\n", cj.Name, gUpgradeRelease)
+		err = upgradeJail(cj, gUpgradeRelease)
+		if err != nil {
+			fmt.Printf("ERROR: %s\n", err.Error())
+		} else {
+			fmt.Printf("  > Upgrade jail %s: OK\n", cj.Name)
+		}
+	}
+}

cmd/utils.go

@@ -365,9 +365,83 @@ func executeCommandWithOutputToStdout(cmdline string) (error) {
 	return fmt.Errorf("Unknown error: you shouldn't be here!\n")
 }
 
+/* Execute command plugging stdin and stdout to those of the running command.
+ * Blocking while the command run
+ */
+func executeCommandWithStdinStdoutStderr(cmdline string) (error) {
+	var cmd []string
+
+	if gUseSudo {
+		cmd = append(cmd, "sudo")
+	}
+
+	var word string
+	var in_escaped bool
+	// Split by words, or " enclosed words
+	for i, c := range (cmdline) {
+		if string(c) == "\"" {
+			if in_escaped {
+				// This is the closing "
+				cmd = append(cmd, word)
+				in_escaped = false
+			} else {
+				in_escaped = true
+			}
+			continue
+		}
+		if string(c) == " " {
+			if in_escaped {
+				word = word + string(c)
+				continue
+			} else {
+				cmd = append(cmd, word)
+				word = ""
+				continue
+			}
+		}
+		if i == (len(cmdline) - 1) {
+			word = word + string(c)
+			cmd = append(cmd, word)
+			break
+		}
+
+		// else
+		word = word + string(c)
+	}
+
+	var command *exec.Cmd
+	if len(cmd) > 1 {
+		command = exec.Command(cmd[0], cmd[1:]...)
+	} else {
+		command = exec.Command(cmd[0])
+	}
+
+	// Get environment
+	command.Env = os.Environ()
+
+	// Connect command to current stdin/out/err
+	command.Stdin = os.Stdin
+	command.Stdout = os.Stdout
+	command.Stderr = os.Stderr
+
+	if err := command.Start(); err != nil {
+		return err
+	}
+
+	err := command.Wait()
+
+	return err
+}
+
+
 func executeCommandInJail(jail *Jail, cmdline string) (string, error) {
 	var cmd []string
 
+	// We can't execute on non-running jail
+	if jail.Running == false {
+		return "", errors.New("Can't execute command on stopped jail")
+	}
+
 	if gUseSudo {
 		cmd = append(cmd, "sudo")
 	}
@@ -415,6 +489,10 @@ func executeCommandInJail(jail *Jail, cmdline string) (string, error) {
 		word = word + string(c)
 	}
 	
+	if gDebug {
+		fmt.Printf("DEBUG: executeCommandInJail: prepare to execute \"%s\"\n", cmd)
+	}
+
 	out, err := exec.Command(cmd[0], cmd[1:]...).CombinedOutput()
 
 	return string(out), err
@@ -568,7 +646,7 @@ func doZfsDatasetExist(dataset string) (bool, error) {
 }
 
 // Create ZFS dataset. mountpoint can be "none", then the dataset won't be mounted
-func createZfsDataset(dataset, mountpoint, compression string) error {
+func zfsCreateDataset(dataset, mountpoint, compression string) error {
 	cmd := fmt.Sprintf("zfs create -o mountpoint=%s -o compression=%s %s", mountpoint, compression, dataset)
 	out, err := executeCommand(cmd)
 	if err != nil {
@@ -576,6 +654,26 @@ func createZfsDataset(dataset, mountpoint, compression string) error {
 	}
 	return nil
 }
+// 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)
+	out, err := executeCommand(cmd)
+	if err != nil {
+		return "", errors.New(fmt.Sprintf("%v; command returned \"%s\"", err, out))
+	}
+
+	return strings.TrimSuffix(out, "\n"), nil
+}
+
+// Delete a ZFS Dataset by name
+func zfsDestroy(dataset string) error {
+	cmd := fmt.Sprintf("zfs destroy -r %s", dataset)
+	out, err := executeCommand(cmd)
+	if err != nil {
+		return errors.New(fmt.Sprintf("%v; command returned \"%s\"", err, out))
+	}
+	return nil
+}
 
 /*****************************************************************************
  *
@@ -682,6 +780,33 @@ func copyDevfsRuleset(ruleset int, srcrs int) error {
 	return nil
 }
 
+/********************************************************************************
+ * Add a rule to specified ruleset
+ * Ex.: addDevfsRuleToRuleset("path bpf* unhide", 1002)
+ *******************************************************************************/
+func addDevfsRuleToRuleset(rule string, ruleset int) error {
+	// TODO: Check if rule not already enabled. We will need to recurse into includes.
+	// Get last rule index
+	rules := getDevfsRuleset(ruleset)
+	if len(rules) == 0 {
+		fmt.Printf("Error listing ruleset %d\n", ruleset)
+		return errors.New(fmt.Sprintf("Error listing rueset %d\n", ruleset))
+	}
+	
+	f := strings.Fields(rules[(len(rules)-1)])
+	//fmt.Printf("Dernier index du ruleset %d: %s\n", ruleset, f[0])
+	index, _ := strconv.Atoi(f[0])
+	index += 100
+	
+	cmd := fmt.Sprintf("/sbin/devfs rule -s %d add %d %s", ruleset, index, rule)
+	out, err := executeCommand(cmd)
+	if err != nil {
+		return errors.New(fmt.Sprintf("Error adding rule \"%s\" to ruleset %d: %s", rule, ruleset, out))
+	}
+	
+	return nil
+}
+
 /********************************************************************************
  * Returns value of parameter as read in /var/run/jail.$InternalName.conf
  * Directives without value will return "true" if found
@@ -710,32 +835,6 @@ func getValueFromRunningConfig(jname string, param string) (string, error) {
 	
 	return "", fmt.Errorf("Parameter not found: %s", param)
 }
-/********************************************************************************
- * Add a rule to specified ruleset
- * Ex.: addDevfsRuleToRuleset("path bpf* unhide", 1002)
- *******************************************************************************/
-func addDevfsRuleToRuleset(rule string, ruleset int) error {
-	// TODO: Check if rule not already enabled. We will need to recurse into includes.
-	// Get last rule index
-	rules := getDevfsRuleset(ruleset)
-	if len(rules) == 0 {
-		fmt.Printf("Error listing ruleset %d\n", ruleset)
-		return errors.New(fmt.Sprintf("Error listing rueset %d\n", ruleset))
-	}
-	
-	f := strings.Fields(rules[(len(rules)-1)])
-	//fmt.Printf("Dernier index du ruleset %d: %s\n", ruleset, f[0])
-	index, _ := strconv.Atoi(f[0])
-	index += 100
-	
-	cmd := fmt.Sprintf("/sbin/devfs rule -s %d add %d %s", ruleset, index, rule)
-	out, err := executeCommand(cmd)
-	if err != nil {
-		return errors.New(fmt.Sprintf("Error adding rule \"%s\" to ruleset %d: %s", rule, ruleset, out))
-	}
-	
-	return nil
-}
 
 
 /******************************************************************************