瀏覽代碼

Merge pull request #22098 from thaJeztah/cherry-pick-21998

cherry-pick "runc install path changed from /usr/local/bin to /usr/local/sbin"
Vincent Demeester 9 年之前
父節點
當前提交
9b6c055f92
共有 2 個文件被更改,包括 2 次插入2 次删除
  1. 1 1
      hack/make/.build-deb/rules
  2. 1 1
      hack/make/.build-rpm/docker-engine.spec

+ 1 - 1
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:

+ 1 - 1
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