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

fix Error unmounting display bug, unconditionally unmount /dev & /dev/fd, remove parameter file

Browse Source
This commit is contained in:
yo 2022-06-19 19:14:11 +02:00
parent e87699e2dc
commit 0f4f76a9a2
1 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
cmd/stop.go
View File

@ -132,7 +132,7 @@ func umountJailFsFromHost(jail *Jail, mountpoint string) error {
cmd = fmt.Sprintf("umount %s%s", jail.RootPath, mountpoint) cmd = fmt.Sprintf("umount %s%s", jail.RootPath, mountpoint)
_, err := executeCommand(cmd) _, err := executeCommand(cmd)
if err != nil { if err != nil {
return errors.New(fmt.Sprintf("Error umounting %s/%s: %s", jail.RootPath, mountpoint, err.Error())) return errors.New(fmt.Sprintf("Error umounting %s%s: %s", jail.RootPath, mountpoint, err.Error()))
} }
return nil return nil
} }
@ -293,15 +293,16 @@ func StopJail(args []string) {
} }
} }
if cj.Config.Mount_fdescfs > 0 { // FIXME: /dev/fd is mounted even with Mount_fdescfs = 0 ?!
//if cj.Config.Mount_fdescfs > 0 {
fmt.Printf(" > Umount fdescfs:\n") fmt.Printf(" > Umount fdescfs:\n")
err := umountJailFsFromHost(cj, "/dev/fd") err = umountJailFsFromHost(cj, "/dev/fd")
if err != nil { if err != nil {
fmt.Printf("ERROR: %s\n", err.Error()) fmt.Printf("ERROR: %s\n", err.Error())
} else { } else {
fmt.Printf(" > Umount fdescfs: OK\n") fmt.Printf(" > Umount fdescfs: OK\n")
} }
} //}
if cj.Config.Mount_devfs > 0 { if cj.Config.Mount_devfs > 0 {
fmt.Printf(" > Umount devfs:\n") fmt.Printf(" > Umount devfs:\n")
@ -314,7 +315,6 @@ func StopJail(args []string) {
} }
// Remove local mounts from $JAIL/fstab // Remove local mounts from $JAIL/fstab
// The way we get fstab is presumptuous
fstab := strings.Replace(cj.ConfigPath, "config.json", "fstab", 1) fstab := strings.Replace(cj.ConfigPath, "config.json", "fstab", 1)
mounts, err := getFstab(fstab) mounts, err := getFstab(fstab)
if err != nil { if err != nil {
@ -334,5 +334,13 @@ func StopJail(args []string) {
fmt.Printf(" > Umount mountpoints from %s: OK\n", fstab) fmt.Printf(" > Umount mountpoints from %s: OK\n", fstab)
} }
} }
// Remove parameter file
pfile := fmt.Sprintf("/var/run/jail.%s.conf", cj.InternalName)
if err = os.Remove(pfile); err != nil {
fmt.Printf("Error deleting parameter file %s\n", pfile)
}
cj.InternalName = ""
} }
} }