From 59162641cc20640afb785540b5f47178835de656 Mon Sep 17 00:00:00 2001
From: Antonio Murdaca <runcom@redhat.com>
Date: Fri, 8 Jul 2016 15:58:06 +0200
Subject: [PATCH] daemon: ensure we set default options to stock runtime

Signed-off-by: Antonio Murdaca <runcom@redhat.com>
---
 daemon/daemon_unix.go | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/daemon/daemon_unix.go b/daemon/daemon_unix.go
index 6df84164a0..afeaedc34e 100644
--- a/daemon/daemon_unix.go
+++ b/daemon/daemon_unix.go
@@ -579,7 +579,11 @@ func verifyDaemonSettings(config *Config) error {
 	if config.Runtimes == nil {
 		config.Runtimes = make(map[string]types.Runtime)
 	}
-	config.Runtimes[stockRuntimeName] = types.Runtime{Path: DefaultRuntimeBinary}
+	stockRuntimeOpts := []string{}
+	if UsingSystemd(config) {
+		stockRuntimeOpts = append(stockRuntimeOpts, "--systemd-cgroup=true")
+	}
+	config.Runtimes[stockRuntimeName] = types.Runtime{Path: DefaultRuntimeBinary, Args: stockRuntimeOpts}
 
 	return nil
 }