From b773db05f9a1e4bc817e9e8a96e665c6c978f12b Mon Sep 17 00:00:00 2001 From: Ilya Dmitrichenko Date: Wed, 10 Feb 2016 16:11:48 +0000 Subject: [PATCH] Remove `MountFlags=slave` from systemd service unit definitions Signed-off-by: Ilya Dmitrichenko --- libmachine/provision/coreos.go | 1 - libmachine/provision/redhat.go | 1 - libmachine/provision/systemd.go | 1 - 3 files changed, 3 deletions(-) diff --git a/libmachine/provision/coreos.go b/libmachine/provision/coreos.go index e6311448c0..44226afb4d 100644 --- a/libmachine/provision/coreos.go +++ b/libmachine/provision/coreos.go @@ -72,7 +72,6 @@ Requires=docker.socket early-docker.target [Service] Environment=TMPDIR=/var/tmp EnvironmentFile=-/run/flannel_docker_opts.env -MountFlags=slave LimitNOFILE=1048576 LimitNPROC=1048576 ExecStart=/usr/lib/coreos/dockerd daemon --host=unix:///var/run/docker.sock --host=tcp://0.0.0.0:{{.DockerPort}} --tlsverify --tlscacert {{.AuthOptions.CaCertRemotePath}} --tlscert {{.AuthOptions.ServerCertRemotePath}} --tlskey {{.AuthOptions.ServerKeyRemotePath}}{{ range .EngineOptions.Labels }} --label {{.}}{{ end }}{{ range .EngineOptions.InsecureRegistry }} --insecure-registry {{.}}{{ end }}{{ range .EngineOptions.RegistryMirror }} --registry-mirror {{.}}{{ end }}{{ range .EngineOptions.ArbitraryFlags }} --{{.}}{{ end }} \$DOCKER_OPTS \$DOCKER_OPT_BIP \$DOCKER_OPT_MTU \$DOCKER_OPT_IPMASQ diff --git a/libmachine/provision/redhat.go b/libmachine/provision/redhat.go index 8c1ac0ddd8..ab89c841b1 100644 --- a/libmachine/provision/redhat.go +++ b/libmachine/provision/redhat.go @@ -28,7 +28,6 @@ gpgkey=https://yum.dockerproject.org/gpg ` engineConfigTemplate = `[Service] ExecStart=/usr/bin/docker daemon -H tcp://0.0.0.0:{{.DockerPort}} -H unix:///var/run/docker.sock --storage-driver {{.EngineOptions.StorageDriver}} --tlsverify --tlscacert {{.AuthOptions.CaCertRemotePath}} --tlscert {{.AuthOptions.ServerCertRemotePath}} --tlskey {{.AuthOptions.ServerKeyRemotePath}} {{ range .EngineOptions.Labels }}--label {{.}} {{ end }}{{ range .EngineOptions.InsecureRegistry }}--insecure-registry {{.}} {{ end }}{{ range .EngineOptions.RegistryMirror }}--registry-mirror {{.}} {{ end }}{{ range .EngineOptions.ArbitraryFlags }}--{{.}} {{ end }} -MountFlags=slave LimitNOFILE=1048576 LimitNPROC=1048576 LimitCORE=infinity diff --git a/libmachine/provision/systemd.go b/libmachine/provision/systemd.go index 7247976aa4..4bf13db7d6 100644 --- a/libmachine/provision/systemd.go +++ b/libmachine/provision/systemd.go @@ -42,7 +42,6 @@ func (p *SystemdProvisioner) GenerateDockerOptions(dockerPort int) (*DockerOptio engineConfigTmpl := `[Service] ExecStart=/usr/bin/docker daemon -H tcp://0.0.0.0:{{.DockerPort}} -H unix:///var/run/docker.sock --storage-driver {{.EngineOptions.StorageDriver}} --tlsverify --tlscacert {{.AuthOptions.CaCertRemotePath}} --tlscert {{.AuthOptions.ServerCertRemotePath}} --tlskey {{.AuthOptions.ServerKeyRemotePath}} {{ range .EngineOptions.Labels }}--label {{.}} {{ end }}{{ range .EngineOptions.InsecureRegistry }}--insecure-registry {{.}} {{ end }}{{ range .EngineOptions.RegistryMirror }}--registry-mirror {{.}} {{ end }}{{ range .EngineOptions.ArbitraryFlags }}--{{.}} {{ end }} -MountFlags=slave LimitNOFILE=1048576 LimitNPROC=1048576 LimitCORE=infinity