Add -p flag to create command to specify jail configuration items in k=v format
This commit is contained in:
@@ -44,7 +44,7 @@ func CreateJail(args []string) {
|
||||
|
||||
var ds *Datastore
|
||||
if len(gCreateArgs.Datastore) > 0 {
|
||||
fmt.Printf("DEBUG: Use %s datastore\n", gCreateArgs.Datastore)
|
||||
log.Debugf("Use %s datastore\n", gCreateArgs.Datastore)
|
||||
ds, err = getDatastoreFromArray(gCreateArgs.Datastore, gDatastores)
|
||||
if err != nil {
|
||||
fmt.Printf("ERROR Getting datastore: %s\n", gCreateArgs.Datastore, err.Error())
|
||||
@@ -272,7 +272,6 @@ func CreateJail(args []string) {
|
||||
j.Config.Host_hostname = jname
|
||||
j.Config.Host_hostuuid = jname
|
||||
j.Config.Jailtype = "jail"
|
||||
|
||||
j.WriteConfigToDisk(false)
|
||||
|
||||
///////////////////////////////////////////////////////////////////////
|
||||
@@ -285,5 +284,17 @@ func CreateJail(args []string) {
|
||||
defer fstabHandle.Close()
|
||||
fmt.Printf(" > Jail created!\n")
|
||||
}
|
||||
|
||||
var cmdline []string
|
||||
for _, props := range strings.Split(gCreateArgs.Properties, ",") {
|
||||
cmdline = append(cmdline, props)
|
||||
}
|
||||
|
||||
// Reload jail list so SetJailProperties will see it
|
||||
ListJails(nil, false)
|
||||
|
||||
cmdline = append(cmdline, jname)
|
||||
log.Debugf("cmdline: \"%v\"", cmdline)
|
||||
SetJailProperties(cmdline)
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user