v0.36c: Moved and renamed writeConfigToDisk into utils.go

cmd/root.go

@@ -6,7 +6,6 @@ import (
 	"sync"
 	"strings"
 	"io/ioutil"
-	"encoding/json"
 
 	"github.com/spf13/cobra"
 	"github.com/spf13/viper"
@@ -15,7 +14,7 @@ import (
 )
 
 const (
-	gVersion = "0.36b"
+	gVersion = "0.36c"
 	
 	// TODO : Get from $jail_zpool/defaults.json
 	MIN_DYN_DEVFS_RULESET = 1000
@@ -479,58 +478,6 @@ func initConfig() {
 	}
 }
 
-/********************************************************************************
- * Write jail(s) config which been updated to disk.
- * If name is specified, work on the jail. If name is empty string, work on all.
- * If changeauto not set, values which are in "auto" mode on disk
- *  won't be overwritten (p.ex defaultrouter wont be overwritten with current
- *  default route, so if route change on jailhost this will reflect on jail next
- *  start)
- *******************************************************************************/
-func WriteConfigToDisk(j *Jail, changeauto bool) {
-	// we will manipulate properties so get a copy
-	jc := j.Config
-
-	if changeauto == false {
-		// Overwrite "auto" properties
-		ondiskjc, err := getJailConfig(j.ConfigPath)
-		if err != nil {
-			panic(err)
-		}
-		// TODO : List all fields, then call getStructFieldValue to compare value with "auto"
-		// If "auto" then keep it that way before writing ondiskjc to disk
-		var properties []string
-		properties = getStructFieldNames(ondiskjc, properties, "")
-
-		for _, p := range properties {
-			v, _, err := getStructFieldValue(ondiskjc, p)
-			if err != nil {
-				panic(err)
-			}
-			if v.String() == "auto" {
-				err = setStructFieldValue(&jc, p, "auto")
-				if err != nil {
-					fmt.Printf("ERROR sanitizing config: %s\n", err.Error())
-					os.Exit(1)
-				}
-			}
-		}
-	}
-
-	marshaled, err := json.MarshalIndent(jc, "", "    ")
-	if err != nil {
-		fmt.Printf("ERROR marshaling config: %s\n", err.Error())
-	}
-
-	//fmt.Printf("DEBUG: Will write config to disk, with content:\n")
-	//fmt.Printf(string(marshaled))
-
-	if os.WriteFile(j.ConfigPath, []byte(marshaled), 0644); err != nil {
-		fmt.Printf("Error writing config file %s: %v\n", j.ConfigPath, err)
-		os.Exit(1)
-	}
-}
-
 
 func Execute() {
 	if err := rootCmd.Execute(); err != nil {