Merge pull request #1009 from hashicorp/b-more-chroot

Chroot all of /usr/
hashicorp · Mar 30, 2016 · be1266e · be1266e
2 parents 67690f1 + cfb46db
commit be1266e
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 5 deletions.
diff --git a/client/driver/executor/executor_linux.go b/client/driver/executor/executor_linux.go
@@ -29,10 +29,7 @@ var (
 		"/lib64":          "/lib64",
 		"/run/resolvconf": "/run/resolvconf",
 		"/sbin":           "/sbin",
-		"/usr/bin":        "/usr/bin",
-		"/usr/lib":        "/usr/lib",
-		"/usr/sbin":       "/usr/sbin",
-		"/usr/share":      "/usr/share",
+		"/usr":            "/usr",
 	}
 )
 

diff --git a/client/driver/java.go b/client/driver/java.go
@@ -63,7 +63,7 @@ func NewJavaDriver(ctx *DriverContext) Driver {
 func (d *JavaDriver) Fingerprint(cfg *config.Config, node *structs.Node) (bool, error) {
 	// Only enable if we are root and cgroups are mounted when running on linux systems.
 	if runtime.GOOS == "linux" && (syscall.Geteuid() != 0 || !d.cgroupsMounted(node)) {
-		d.logger.Printf("[DEBUG] driver.java: must run as root user on linux, disabling")
+		d.logger.Printf("[DEBUG] driver.java: root priviledges and mounted cgroups required on linux, disabling")
 		return false, nil
 	}