Sfoglia il codice sorgente

Merge pull request #16192 from anusha-ragunathan/dev

Updated rpm spec to perform cleaner installs
David Calavera 9 anni fa
parent
commit
72f355e466
1 ha cambiato i file con 4 aggiunte e 4 eliminazioni
  1. 4 4
      hack/make/.build-rpm/docker-engine.spec

+ 4 - 4
hack/make/.build-rpm/docker-engine.spec

@@ -129,11 +129,10 @@ install -d $RPM_BUILD_ROOT/%{_initddir}
 install -d $RPM_BUILD_ROOT/%{_unitdir}
 install -p -m 644 contrib/init/systemd/docker.service $RPM_BUILD_ROOT/%{_unitdir}/docker.service
 install -p -m 644 contrib/init/systemd/docker.socket $RPM_BUILD_ROOT/%{_unitdir}/docker.socket
-%endif
-
+%else
 install -p -m 644 contrib/init/sysvinit-redhat/docker.sysconfig $RPM_BUILD_ROOT/etc/sysconfig/docker
 install -p -m 755 contrib/init/sysvinit-redhat/docker $RPM_BUILD_ROOT/%{_initddir}/docker
-
+%endif
 # add bash completions
 install -d $RPM_BUILD_ROOT/usr/share/bash-completion/completions
 install -d $RPM_BUILD_ROOT/usr/share/zsh/vendor-completions
@@ -168,9 +167,10 @@ install -p -m 644 contrib/syntax/nano/Dockerfile.nanorc $RPM_BUILD_ROOT/usr/shar
 %if 0%{?is_systemd}
 /%{_unitdir}/docker.service
 /%{_unitdir}/docker.socket
-%endif
+%else
 /etc/sysconfig/docker
 /%{_initddir}/docker
+%endif
 /usr/share/bash-completion/completions/docker
 /usr/share/zsh/vendor-completions/_docker
 /usr/share/fish/completions/docker.fish