vbatts/pkg
1
0
Fork 0
Code Pull requests Releases Activity

Merge pull request #17438 from pmalmgren/17037-systemd226-cgroup

Browse source 
Fix docker status incorrectly reports containerized
This commit is contained in:
David Calavera 2015-11-30 11:47:16 -08:00
commit c631a9bec7
2 changed files with 23 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
parsers/operatingsystem/operatingsystem_linux.go
View file

@ -69,7 +69,7 @@ func IsContainerized() (bool, error) {
return false, err
}
for _, line := range bytes.Split(b, []byte{'\n'}) {
if len(line) > 0 && !bytes.HasSuffix(line, []byte{'/'}) {
if len(line) > 0 && !bytes.HasSuffix(line, []byte{'/'}) && !bytes.HasSuffix(line, []byte("init.scope")) {
return true, nil
}
}