From bce84ce2c891ebee5b9660432a10b798528b8eb4 Mon Sep 17 00:00:00 2001
From: Antonio Murdaca <runcom@redhat.com>
Date: Apr 15 2016 09:13:07 +0000
Subject: fix containerd socket location


Signed-off-by: Antonio Murdaca <runcom@redhat.com>

---

diff --git a/docker-containerd.service b/docker-containerd.service
index 9d3ba1a..7744516 100644
--- a/docker-containerd.service
+++ b/docker-containerd.service
@@ -4,7 +4,7 @@ Documentation=https://containerd.tools/
 After=network.target
 
 [Service]
-ExecStart=/usr/libexec/docker/docker-containerd --listen /run/docker/containerd.sock --runtime /usr/libexec/docker/docker-runc
+ExecStart=/usr/libexec/docker/docker-containerd --listen /run/containerd.sock --runtime /usr/libexec/docker/docker-runc
 LimitNOFILE=1048576
 LimitNPROC=1048576
 LimitCORE=infinity
diff --git a/docker.service b/docker.service
index c5b4bc3..f70484e 100644
--- a/docker.service
+++ b/docker.service
@@ -12,7 +12,7 @@ EnvironmentFile=-/etc/sysconfig/docker-storage
 EnvironmentFile=-/etc/sysconfig/docker-network
 Environment=GOTRACEBACK=crash
 ExecStart=/usr/bin/docker daemon \
-          --containerd /run/docker/containerd.sock \
+          --containerd /run/containerd.sock \
           --exec-opt native.cgroupdriver=systemd \
           $OPTIONS \
           $DOCKER_STORAGE_OPTIONS \
diff --git a/docker.spec b/docker.spec
index 2411b18..dcf2a26 100644
--- a/docker.spec
+++ b/docker.spec
@@ -79,7 +79,7 @@
 %global _format() export %1=""; for x in %{modulenames}; do %1+=%2; %1+=" "; done;
 
 # Relabel files
-%global relabel_files() %{_sbindir}/restorecon -R %{_bindir}/%{repo} %{_localstatedir}/run/%{repo}.sock %{_localstatedir}/run/%{repo}.pid %{_sysconfdir}/%{repo} %{_localstatedir}/log/%{repo} %{_localstatedir}/log/lxc %{_localstatedir}/lock/lxc %{_unitdir}/%{repo}.service %{_unitdir}/%{repo}-containerd.service %{_sysconfdir}/%{repo} &> /dev/null || :
+%global relabel_files() %{_sbindir}/restorecon -R %{_bindir}/%{repo} %{_localstatedir}/run/containerd.sock %{_localstatedir}/run/%{repo}.sock %{_localstatedir}/run/%{repo}.pid %{_sysconfdir}/%{repo} %{_localstatedir}/log/%{repo} %{_localstatedir}/log/lxc %{_localstatedir}/lock/lxc %{_unitdir}/%{repo}.service %{_unitdir}/%{repo}-containerd.service %{_sysconfdir}/%{repo} &> /dev/null || :
 
 # Version of SELinux we were using
 %if 0%{?fedora} >= 22
@@ -95,7 +95,7 @@ Name: %{repo}
 %endif
 Epoch: 2
 Version: 1.11
-Release: 3.git%{shortcommit0}%{?dist}
+Release: 4.git%{shortcommit0}%{?dist}
 Summary: Automates deployment of containerized applications
 License: ASL 2.0
 URL: https://%{provider}.%{provider_tld}/projectatomic/%{repo}
@@ -820,6 +820,9 @@ exit 0
 %{_bindir}/v1.10-migrator-local
 
 %changelog
+* Fri Apr 15 2016 Antonio Murdaca <runcom@fedoraproject.org> - 2:1.11-4.git69e6294
+- fix containerd socket location
+
 * Fri Apr 15 2016 Antonio Murdaca <runcom@fedoraproject.org> - 2:1.11-3.git69e6294
 - rebuilt with fixes to unit files and re-enable debug