updated cadvisor deps
This commit is contained in:
15
vendor/github.com/google/cadvisor/devicemapper/util.go
generated
vendored
15
vendor/github.com/google/cadvisor/devicemapper/util.go
generated
vendored
@@ -22,15 +22,11 @@ import (
|
||||
// ThinLsBinaryPresent returns the location of the thin_ls binary in the mount
|
||||
// namespace cadvisor is running in or an error. The locations checked are:
|
||||
//
|
||||
// - /sbin/
|
||||
// - /bin/
|
||||
// - /usr/sbin/
|
||||
// - /usr/bin/
|
||||
//
|
||||
// ThinLsBinaryPresent checks these paths relative to:
|
||||
//
|
||||
// 1. For non-containerized operation - `/`
|
||||
// 2. For containerized operation - `/rootfs`
|
||||
//
|
||||
// The thin_ls binary is provided by the device-mapper-persistent-data
|
||||
// package.
|
||||
func ThinLsBinaryPresent() (string, error) {
|
||||
@@ -39,7 +35,7 @@ func ThinLsBinaryPresent() (string, error) {
|
||||
err error
|
||||
)
|
||||
|
||||
for _, path := range []string{"/bin", "/usr/sbin/", "/usr/bin"} {
|
||||
for _, path := range []string{"/sbin", "/bin", "/usr/sbin/", "/usr/bin"} {
|
||||
// try paths for non-containerized operation
|
||||
// note: thin_ls is most likely a symlink to pdata_tools
|
||||
thinLsPath = filepath.Join(path, "thin_ls")
|
||||
@@ -47,13 +43,6 @@ func ThinLsBinaryPresent() (string, error) {
|
||||
if err == nil {
|
||||
return thinLsPath, nil
|
||||
}
|
||||
|
||||
// try paths for containerized operation
|
||||
thinLsPath = filepath.Join("/rootfs", thinLsPath)
|
||||
_, err = os.Stat(thinLsPath)
|
||||
if err == nil {
|
||||
return thinLsPath, nil
|
||||
}
|
||||
}
|
||||
|
||||
return "", fmt.Errorf("unable to find thin_ls binary")
|
||||
|
Reference in New Issue
Block a user