yo/gocage
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

datasets now should be specified with zpool

Browse Source
This commit is contained in:
yo 2023-06-03 11:18:40 +02:00
parent 00fd283987
commit a4ff9c1d51
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
cmd/stop.go
View File

@ -50,10 +50,10 @@ func umountAndUnjailZFS(jail *Jail) error {
for _, zd := range ds { for _, zd := range ds {
// 1. Get dataset and childs // 1. Get dataset and childs
cmd := fmt.Sprintf("zfs list -H -r -o name -S name %s/%s", jail.Zpool, zd) cmd := fmt.Sprintf("zfs list -H -r -o name -S name %s", zd)
out, err := executeCommand(cmd) out, err := executeCommand(cmd)
if err != nil { if err != nil {
fmt.Printf(fmt.Sprintf("ERROR listing dataset %s/%s\n", jail.Zpool, zd)) fmt.Printf(fmt.Sprintf("ERROR listing dataset %s\n", zd))
os.Exit(1) os.Exit(1)
} }
for _, c := range strings.Split(out, "\n") { for _, c := range strings.Split(out, "\n") {
@ -71,10 +71,10 @@ func umountAndUnjailZFS(jail *Jail) error {
} }
// 2. Unjail dataset from the host // 2. Unjail dataset from the host
cmd := fmt.Sprintf("zfs unjail %s %s/%s", jail.InternalName, jail.Zpool, ds[len(ds)-1]) cmd := fmt.Sprintf("zfs unjail %s %s", jail.InternalName, ds[len(ds)-1])
_, err := executeCommand(cmd) _, err := executeCommand(cmd)
if err != nil { if err != nil {
fmt.Printf("ERROR unjailing %s/%s: %s\n", jail.Zpool, ds[len(ds)-1], err.Error()) fmt.Printf("ERROR unjailing %s: %s\n", ds[len(ds)-1], err.Error())
return err return err
} }