diff options
| author | Vincent Demeester <vincent@sbr.pm> | 2016-04-18 11:09:55 +0200 |
|---|---|---|
| committer | Vincent Demeester <vincent@sbr.pm> | 2016-04-18 11:09:55 +0200 |
| commit | 9b6c055f920b596ba487e4ce0a9bb5f7d8df393d (patch) | |
| tree | a1e8411e1762fc5699c31a63a862672a9898f0d8 | |
| parent | bbf3c0251d56640859223c892c4a3855603cd3ef (diff) | |
| parent | cbb6c6e959e48182f31b15046f5024572980af96 (diff) | |
| download | docker-9b6c055f920b596ba487e4ce0a9bb5f7d8df393d.tar.gz | |
Merge pull request #22098 from thaJeztah/cherry-pick-21998
cherry-pick "runc install path changed from /usr/local/bin to /usr/local/sbin"
| -rwxr-xr-x | hack/make/.build-deb/rules | 2 | ||||
| -rw-r--r-- | hack/make/.build-rpm/docker-engine.spec | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/hack/make/.build-deb/rules b/hack/make/.build-deb/rules index 651105f7a8..9d999ebaaf 100755 --- a/hack/make/.build-deb/rules +++ b/hack/make/.build-deb/rules @@ -23,7 +23,7 @@ override_dh_auto_install: cp -aT /usr/local/bin/containerd debian/docker-engine/usr/bin/docker-containerd cp -aT /usr/local/bin/containerd-shim debian/docker-engine/usr/bin/docker-containerd-shim cp -aT /usr/local/bin/ctr debian/docker-engine/usr/bin/docker-containerd-ctr - cp -aT /usr/local/bin/runc debian/docker-engine/usr/bin/docker-runc + cp -aT /usr/local/sbin/runc debian/docker-engine/usr/bin/docker-runc mkdir -p debian/docker-engine/usr/lib/docker override_dh_installinit: diff --git a/hack/make/.build-rpm/docker-engine.spec b/hack/make/.build-rpm/docker-engine.spec index 4f366dd39d..e0fb5c8801 100644 --- a/hack/make/.build-rpm/docker-engine.spec +++ b/hack/make/.build-rpm/docker-engine.spec @@ -125,7 +125,7 @@ install -p -m 755 /usr/local/bin/containerd-shim $RPM_BUILD_ROOT/%{_bindir}/dock install -p -m 755 /usr/local/bin/ctr $RPM_BUILD_ROOT/%{_bindir}/docker-containerd-ctr # install runc -install -p -m 755 /usr/local/bin/runc $RPM_BUILD_ROOT/%{_bindir}/docker-runc +install -p -m 755 /usr/local/sbin/runc $RPM_BUILD_ROOT/%{_bindir}/docker-runc # install udev rules install -d $RPM_BUILD_ROOT/%{_sysconfdir}/udev/rules.d |