Skip to content

Commit be1266e

Browse files
committed
Merge pull request #1009 from hashicorp/b-more-chroot
Chroot all of /usr/
2 parents 67690f1 + cfb46db commit be1266e

File tree

2 files changed

+2
-5
lines changed

2 files changed

+2
-5
lines changed

client/driver/executor/executor_linux.go

+1-4
Original file line numberDiff line numberDiff line change
@@ -29,10 +29,7 @@ var (
2929
"/lib64": "/lib64",
3030
"/run/resolvconf": "/run/resolvconf",
3131
"/sbin": "/sbin",
32-
"/usr/bin": "/usr/bin",
33-
"/usr/lib": "/usr/lib",
34-
"/usr/sbin": "/usr/sbin",
35-
"/usr/share": "/usr/share",
32+
"/usr": "/usr",
3633
}
3734
)
3835

client/driver/java.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ func NewJavaDriver(ctx *DriverContext) Driver {
6363
func (d *JavaDriver) Fingerprint(cfg *config.Config, node *structs.Node) (bool, error) {
6464
// Only enable if we are root and cgroups are mounted when running on linux systems.
6565
if runtime.GOOS == "linux" && (syscall.Geteuid() != 0 || !d.cgroupsMounted(node)) {
66-
d.logger.Printf("[DEBUG] driver.java: must run as root user on linux, disabling")
66+
d.logger.Printf("[DEBUG] driver.java: root priviledges and mounted cgroups required on linux, disabling")
6767
return false, nil
6868
}
6969

0 commit comments

Comments
 (0)