From 89db166040d46ed0029b5ccc8eb59eae24e27503 Mon Sep 17 00:00:00 2001 From: yo Date: Sun, 20 Nov 2022 20:17:59 +0100 Subject: [PATCH] FIXME: Update release in config file when stopping jail --- cmd/stop.go | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/cmd/stop.go b/cmd/stop.go index 46d352a..3619141 100644 --- a/cmd/stop.go +++ b/cmd/stop.go @@ -228,14 +228,24 @@ func StopJail(args []string) { fmt.Printf("Error getting jail: %s\n", err) continue } - + if cj.Running == false { fmt.Printf("Jail %s is not running!\n", cj.Name) continue } - + fmt.Printf("> Stopping jail %s\n", a) - + + // Get current version to update config.json + cvers, err := executeCommandInJail(cj, "/bin/freebsd-version") + if err != nil { + fmt.Printf("ERROR: %s\n", err.Error()) + return + } + cvers = strings.TrimRight(cvers, "\n") + fmt.Sprintf(cj.Config.Release, cvers) + cj.ConfigUpdated = true + out, err := executeCommand(fmt.Sprintf("rctl jail:%s", cj.InternalName)) if err == nil && len(out) > 0 { fmt.Printf(" > Remove RCTL rules:\n") @@ -399,5 +409,8 @@ func StopJail(args []string) { } } } + + WriteConfigToDisk(cj.Name, false, true) + } }