From 97708281eba312f3483a27cbb2bd45cf2eac5661 Mon Sep 17 00:00:00 2001 From: Akihiro Suda Date: Fri, 26 Jun 2020 17:57:03 +0900 Subject: [PATCH] info: improve "WARNING: Running in rootless-mode without cgroup" The cgroup v2 mode uses systemd driver by default. Suggesting to set exec-opt "native.cgroupdriver=systemd" isn't meaningful. Signed-off-by: Akihiro Suda --- daemon/info_unix.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/daemon/info_unix.go b/daemon/info_unix.go index b9d54101b0..89ffc9ed5c 100644 --- a/daemon/info_unix.go +++ b/daemon/info_unix.go @@ -89,9 +89,9 @@ func (daemon *Daemon) fillPlatformInfo(v *types.Info, sysInfo *sysinfo.SysInfo) if v.CgroupDriver == cgroupNoneDriver { if v.CgroupVersion == "2" { - v.Warnings = append(v.Warnings, "WARNING: Running in rootless-mode without cgroup. To enable cgroup in rootless-mode, you need to set exec-opt \"native.cgroupdriver=systemd\".") + v.Warnings = append(v.Warnings, "WARNING: Running in rootless-mode without cgroups. Systemd is required to enable cgroups in rootless-mode.") } else { - v.Warnings = append(v.Warnings, "WARNING: Running in rootless-mode without cgroup. To enable cgroup in rootless-mode, you need to boot the system in cgroup v2 mode and set exec-opt \"native.cgroupdriver=systemd\".") + v.Warnings = append(v.Warnings, "WARNING: Running in rootless-mode without cgroups. To enable cgroups in rootless-mode, you need to boot the system in cgroup v2 mode.") } } else { if !v.MemoryLimit {