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

BUGFIX umounting jail fstab, add umountFsFromHost

Browse Source
This commit is contained in:
yo 2023-08-06 14:50:32 +02:00
parent 346fd52a8e
commit 14984f417c
1 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
cmd/stop.go
View File

@ -123,7 +123,7 @@ func deleteDevfsRuleset(ruleset int) error {
return nil return nil
} }
func umountJailFsFromHost(jail *Jail, mountpoint string) error { func umountFsFromHost(mountpoint string) error {
cmd := "mount -p" cmd := "mount -p"
out, err := executeCommand(cmd) out, err := executeCommand(cmd)
if err != nil { if err != nil {
@ -134,11 +134,11 @@ func umountJailFsFromHost(jail *Jail, mountpoint string) error {
for _, l := range strings.Split(out, "\n") { for _, l := range strings.Split(out, "\n") {
f := strings.Split(remSpPtrn.ReplaceAllString(l, " "), " ") f := strings.Split(remSpPtrn.ReplaceAllString(l, " "), " ")
if len(f) > 2 { if len(f) > 2 {
if strings.EqualFold(f[1], fmt.Sprintf("%s%s", jail.RootPath, mountpoint)) { if strings.EqualFold(f[1], mountpoint) {
cmd = fmt.Sprintf("umount %s%s", jail.RootPath, mountpoint) cmd = fmt.Sprintf("umount %s", 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", mountpoint, err.Error()))
} }
return nil return nil
} }
@ -148,6 +148,10 @@ func umountJailFsFromHost(jail *Jail, mountpoint string) error {
return nil return nil
} }
func umountJailFsFromHost(jail *Jail, mountpoint string) error {
return umountFsFromHost(fmt.Sprintf("%s%s", jail.RootPath, mountpoint))
}
// Internal usage only // Internal usage only
func stopJail(jail *Jail) error { func stopJail(jail *Jail) error {
cmd := "jail -q" cmd := "jail -q"
@ -270,7 +274,7 @@ func StopJail(args []string) {
for _, a := range args { for _, a := range args {
// Check if jail exist and is distinctly named // Check if jail exist and is distinctly named
cj, err = getJailFromArray(a, []string{"jail"}, gJails) cj, err = getJailFromArray(a, []string{"basejail", "jail"}, gJails)
if err != nil { if err != nil {
fmt.Printf("Error getting jail: %s\n", err) fmt.Printf("Error getting jail: %s\n", err)
continue continue
@ -404,7 +408,8 @@ func StopJail(args []string) {
fmt.Printf(" > Umount mountpoints from %s\n", fstab) fmt.Printf(" > Umount mountpoints from %s\n", fstab)
errs := 0 errs := 0
for _, m := range mounts { for _, m := range mounts {
err = umountJailFsFromHost(cj, m.Mountpoint) log.Debugf("Umounting %s\n", m.Mountpoint)
err = umountFsFromHost(m.Mountpoint)
if err != nil { if err != nil {
fmt.Printf("ERROR: %s\n", err.Error()) fmt.Printf("ERROR: %s\n", err.Error())
errs += 1 errs += 1