kemko/nomad
1
0
Fork 0
mirror of https://github.com/kemko/nomad.git synced 2026-01-05 18:05:42 +03:00
Code Issues Packages Projects Releases Wiki Activity

include all of usr

Browse Source
This commit is contained in:
Alex Dadgar
2016-03-29 16:14:56 -07:00
parent a4e4819716
commit cfb46db65f
2 changed files with 2 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
client/driver/executor/executor_linux.go
View File

@@ -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",
}
)

2
client/driver/java.go
View File

@@ -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
}