diff --git a/fs/fs.go b/fs/fs.go index 58f2b1b8..cb45c33c 100644 --- a/fs/fs.go +++ b/fs/fs.go @@ -329,7 +329,8 @@ func (i *RealFsInfo) updateContainerImagesPath(label string, mounts []mount.Moun for _, m := range mounts { if _, ok := containerImagePaths[m.MountPoint]; ok { if useMount == nil || (len(useMount.MountPoint) < len(m.MountPoint)) { - useMount = &m + useMount = new(mount.MountInfo) + *useMount = m } } } diff --git a/fs/fs_test.go b/fs/fs_test.go index 7de0c3c1..dae8e4d5 100644 --- a/fs/fs_test.go +++ b/fs/fs_test.go @@ -360,6 +360,22 @@ func TestAddDockerImagesLabel(t *testing.T) { expectedDockerDevice string expectedPartition *partition }{ + { + name: "single partition, no dedicated image fs", + mounts: []mount.MountInfo{ + { + Source: "/dev/root", + MountPoint: "/", + FsType: "ext4", + }, + { + Source: "/sys/fs/cgroup", + MountPoint: "/sys/fs/cgroup", + FsType: "tmpfs", + }, + }, + expectedDockerDevice: "/dev/root", + }, { name: "devicemapper, not loopback", driver: "devicemapper",