From fab32d20c7bce69c5197516cdfd61123f61bee28 Mon Sep 17 00:00:00 2001 From: Jim Perrin Date: Dec 10 2014 19:00:30 +0000 Subject: minor spec changes. comment out most subscription bits --- diff --git a/SPECS/docker.spec b/SPECS/docker.spec index e165ef3..cd0f198 100644 --- a/SPECS/docker.spec +++ b/SPECS/docker.spec @@ -255,14 +255,14 @@ install -p -m 644 %{SOURCE3} %{buildroot}%{_sysconfdir}/sysconfig/docker install -p -m 644 %{SOURCE5} %{buildroot}%{_sysconfdir}/sysconfig/docker-storage # install secrets dir -install -d -p -m 750 %{buildroot}/%{_datadir}/rhel/secrets +#install -d -p -m 750 %{buildroot}/%{_datadir}/rhel/secrets # rhbz#1110876 - update symlinks for subscription management -ln -s %{_sysconfdir}/pki/entitlement %{buildroot}%{_datadir}/rhel/secrets/etc-pki-entitlement -ln -s %{_sysconfdir}/rhsm %{buildroot}%{_datadir}/rhel/secrets/rhsm -ln -s %{_sysconfdir}/yum.repos.d/redhat.repo %{buildroot}%{_datadir}/rhel/secrets/rhel7.repo +#ln -s %{_sysconfdir}/pki/entitlement %{buildroot}%{_datadir}/rhel/secrets/etc-pki-entitlement +#ln -s %{_sysconfdir}/rhsm %{buildroot}%{_datadir}/rhel/secrets/rhsm +#ln -s %{_sysconfdir}/yum.repos.d/redhat.repo %{buildroot}%{_datadir}/rhel/secrets/rhel7.repo -mkdir -p %{buildroot}/etc/docker/certs.d/redhat.com -ln -s /etc/rhsm/ca/redhat-uep.pem %{buildroot}/etc/docker/certs.d/redhat.com/redhat-ca.crt +mkdir -p %{buildroot}/etc/docker/certs.d/ +#ln -s /etc/rhsm/ca/redhat-uep.pem %{buildroot}/etc/docker/certs.d/redhat.com/redhat-ca.crt # Install nsinit install -d -p %{buildroot}%{gopath}/src/%{import_path_libcontainer}/nsinit @@ -313,11 +313,11 @@ exit 0 %{_mandir}/man1/* %{_mandir}/man5/* %{_bindir}/docker -%dir %{_datadir}/rhel -%dir %{_datadir}/rhel/secrets -%{_datadir}/rhel/secrets/etc-pki-entitlement -%{_datadir}/rhel/secrets/rhel7.repo -%{_datadir}/rhel/secrets/rhsm +#%dir %{_datadir}/rhel +#%dir %{_datadir}/rhel/secrets +#%{_datadir}/rhel/secrets/etc-pki-entitlement +#%{_datadir}/rhel/secrets/rhel7.repo +#%{_datadir}/rhel/secrets/rhsm %dir %{_libexecdir}/docker %{_libexecdir}/docker/dockerinit %{_unitdir}/docker.service