[packages/docker] use dockerd instead docker daemon to start daemon

[glen]

commit 29baba5b65b70794ebc5f52b75f991a67360eb6e
Author: Elan Ruusamäe <glen at delfi.ee>
Date:   Sun Oct 16 17:53:44 2016 +0300

    use dockerd instead docker daemon to start daemon

 docker.init             | 2 +-
 docker.spec             | 6 +++---
 docker.sh => dockerd.sh | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)
---
diff --git a/docker.spec b/docker.spec
index 4d04a7f..29ceecd 100644
--- a/docker.spec
+++ b/docker.spec
@@ -25,7 +25,7 @@ Source1:	https://github.com/opencontainers/runc/archive/%{runc_commit}/runc-%{ru
 # Source1-md5:	f8ab0976c658243c61d7636ebbe4087c
 Source2:	https://github.com/docker/containerd/archive/%{containerd_commit}/containerd-%{containerd_commit}.tar.gz
 # Source2-md5:	9e7690cc09625bdb34f7a9fedff270eb
-Source4:	%{name}.sh
+Source4:	%{name}d.sh
 Source7:	%{name}.init
 Source8:	%{name}.sysconfig
 Patch0:		systemd.patch
@@ -181,7 +181,7 @@ install -p containerd/bin/ctr $RPM_BUILD_ROOT%{_sbindir}/docker-containerd-ctr
 cp -p contrib/init/systemd/docker.service $RPM_BUILD_ROOT%{systemdunitdir}
 cp -p contrib/init/systemd/docker.socket $RPM_BUILD_ROOT%{systemdunitdir}
 install -p %{SOURCE7} $RPM_BUILD_ROOT/etc/rc.d/init.d/docker
-install -p %{SOURCE4} $RPM_BUILD_ROOT%{_libexecdir}/docker
+install -p %{SOURCE4} $RPM_BUILD_ROOT%{_libexecdir}/dockerd
 cp -p %{SOURCE8} $RPM_BUILD_ROOT/etc/sysconfig/docker
 
 # install udev rules
@@ -237,7 +237,7 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_sbindir}/docker-proxy
 %attr(755,root,root) %{_sbindir}/docker-runc
 %attr(755,root,root) %{_sbindir}/dockerd
-%attr(755,root,root) %{_libexecdir}/docker
+%attr(755,root,root) %{_libexecdir}/dockerd
 %{systemdunitdir}/docker.service
 %{systemdunitdir}/docker.socket
 /lib/udev/rules.d/80-docker.rules
diff --git a/docker.init b/docker.init
index 7f0df28..a3ee788 100755
--- a/docker.init
+++ b/docker.init
@@ -53,7 +53,7 @@ start() {
 	export DOCKER_LOGFILE
 	daemon \
 		--fork --pidfile $pidfile --waitfortime 60 \
-		/usr/lib/docker daemon $OPTIONS
+		/usr/lib/dockerd $OPTIONS
 
 	RETVAL=$?
 	[ $RETVAL -eq 0 ] && touch /var/lock/subsys/docker
diff --git a/docker.sh b/dockerd.sh
similarity index 61%
rename from docker.sh
rename to dockerd.sh
index d48bd0d..224c705 100755
--- a/docker.sh
+++ b/dockerd.sh
@@ -1,4 +1,4 @@
 #!/bin/sh
 exec 1>>$DOCKER_LOGFILE
 exec 2>&1
-exec /usr/bin/docker "$@"
+exec /usr/sbin/dockerd "$@"
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/docker.git/commitdiff/29baba5b65b70794ebc5f52b75f991a67360eb6e