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

v.0.34 : Jail names can be shortened

Browse Source
This commit is contained in:
yo 2023-07-09 10:38:00 +02:00
parent 5eed121f0b
commit dc4213a8d5
3 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CHANGELOG
View File

@ -1,3 +1,3 @@
v.0.33b : Support jaling datasets on differents pools : jail_zfs_dataset now have to include the pool name 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.33c : Parallelize start/stop of jails with same priority
v.0.34 : jail name can be shortened

2
cmd/root.go
View File

@ -15,7 +15,7 @@ import (
) )
const ( const (
gVersion = "0.33c" gVersion = "0.34"
// TODO : Get from $jail_zpool/defaults.json // TODO : Get from $jail_zpool/defaults.json
MIN_DYN_DEVFS_RULESET = 1000 MIN_DYN_DEVFS_RULESET = 1000

5
cmd/utils.go
View File

@ -772,7 +772,8 @@ func getJailFromArray(name string, jarray []Jail) (*Jail, error) {
} }
for i, j := range jarray { for i, j := range jarray {
if jail == j.Name { //if jail == j.Name {
if strings.HasPrefix(j.Name, jail) {
if len(ds) > 0 { if len(ds) > 0 {
if strings.EqualFold(ds, j.Datastore) { if strings.EqualFold(ds, j.Datastore) {
return &jarray[i], nil return &jarray[i], nil
@ -786,7 +787,7 @@ func getJailFromArray(name string, jarray []Jail) (*Jail, error) {
} }
if len(jails) > 0 { if len(jails) > 0 {
if len(jails) > 1 { if len(jails) > 1 {
return &Jail{}, errors.New("More than one jail found with this name, please use datastore/jail format") return &Jail{}, errors.New("More than one jail matching, please use datastore/jail format or full name")
} else { } else {
return &jails[0], nil return &jails[0], nil
} }