use dockerd instead docker daemon to start daemon

diff --git a/docker.init b/docker.init
index 7f0df2883f5d7ea30a174e72a8a7bfa1398dac18..a3ee788a676883934ea1261087a9e025a4815c83 100755 (executable)
--- 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.spec b/docker.spec
index 4d04a7f4c270ee07ab45b023b9503d6ea2d6b8c8..29ceecdf9689ae975310813f95577e9e4dca23b2 100644 (file)
--- 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.sh b/dockerd.sh
similarity index 61%
rename from docker.sh
rename to dockerd.sh
index d48bd0d266078ee073648cd3bf6b280ff84a195d..224c705089c158f281950f1fdd13ee531297327b 100755 (executable)
--- 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 "$@"