getJailFromArray use name instead of internalName
This commit is contained in:
parent
bc92f29900
commit
249ab19173
@ -209,7 +209,7 @@ func executeCommandInJail(jail *Jail, cmdline string) (string, error) {
|
||||
cs := strings.Split(cmdline, " ")
|
||||
cmd = append(cmd, cs...)
|
||||
|
||||
out, err := exec.Command(cmd[0], cmd[1:]...).Output()
|
||||
out, err := exec.Command(cmd[0], cmd[1:]...).CombinedOutput()
|
||||
|
||||
return string(out), err
|
||||
}
|
||||
@ -280,9 +280,9 @@ func getFstab(path string) ([]Mount, error) {
|
||||
/********************************************************************************
|
||||
* Get a specific jail source reference, to update properties after a range loop
|
||||
*******************************************************************************/
|
||||
func getJailFromArray(internalName string, jarray []Jail) (*Jail, error) {
|
||||
func getJailFromArray(name string, jarray []Jail) (*Jail, error) {
|
||||
for _, j := range jarray {
|
||||
if internalName == j.InternalName {
|
||||
if name == j.Name {
|
||||
return &j, nil
|
||||
}
|
||||
}
|
||||
|
Loading…
x
Reference in New Issue
Block a user