From 31f2c33f9dd544bb90740d7e8d72e4e909816f16 Mon Sep 17 00:00:00 2001 From: Johnny Hughes Date: Apr 01 2016 09:15:17 +0000 Subject: manual docker debranding --- diff --git a/README.debrand b/README.debrand deleted file mode 100644 index 01c46d2..0000000 --- a/README.debrand +++ /dev/null @@ -1,2 +0,0 @@ -Warning: This package was configured for automatic debranding, but the changes -failed to apply. diff --git a/SOURCES/docker.sysconfig b/SOURCES/docker.sysconfig index 196c66f..d3938bf 100644 --- a/SOURCES/docker.sysconfig +++ b/SOURCES/docker.sysconfig @@ -9,7 +9,7 @@ DOCKER_CERT_PATH=/etc/docker # pull use the ADD_REGISTRY option to list a set of registries, each prepended # with --add-registry flag. The first registry added will be the first registry # searched. -ADD_REGISTRY='--add-registry registry.access.redhat.com' +#ADD_REGISTRY='--add-registry registry.access.redhat.com' # If you want to block registries from being used, uncomment the BLOCK_REGISTRY # option and give it a set of registries, each prepended with --block-registry diff --git a/SPECS/docker.spec b/SPECS/docker.spec index aa7bcdb..41c2be5 100644 --- a/SPECS/docker.spec +++ b/SPECS/docker.spec @@ -104,7 +104,7 @@ Requires(postun): systemd # need xz to work with ubuntu images Requires: xz Requires: device-mapper-libs >= 7:1.02.97 -Requires: subscription-manager +#Requires: subscription-manager Provides: lxc-%{name} = %{version}-%{release} Provides: %{name}-io = %{version}-%{release} @@ -320,16 +320,17 @@ rm -rf %{buildroot}%{_sharedstatedir}/%{name}-unit-test/contrib/init/openrc/%{na # remove %%{name}-selinux rpm spec file rm -rf %{name}-selinux-%{commit2}/%{name}-selinux.spec -# install secrets dir -install -d -p -m 750 %{buildroot}/%{_datadir}/rhel/secrets +# don't install secrets dir +# 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/%{name}/certs.d/redhat.{com,io} -ln -s %{_sysconfdir}/rhsm/ca/redhat-uep.pem %{buildroot}/%{_sysconfdir}/%{name}/certs.d/redhat.com/redhat-ca.crt -ln -s %{_sysconfdir}/rhsm/ca/redhat-uep.pem %{buildroot}/%{_sysconfdir}/%{name}/certs.d/redhat.io/redhat-ca.crt +#mkdir -p %{buildroot}/etc/%{name}/certs.d/redhat.{com,io} +#ln -s %{_sysconfdir}/rhsm/ca/redhat-uep.pem %{buildroot}/%{_sysconfdir}/%{name}/certs.d/redhat.com/redhat-ca.crt +#ln -s %{_sysconfdir}/rhsm/ca/redhat-uep.pem %{buildroot}/%{_sysconfdir}/%{name}/certs.d/redhat.io/redhat-ca.crt +mkdir -p %{buildroot}/etc/%{name}/certs.d # install %%{name} config directory install -dp %{buildroot}%{_sysconfdir}/%{name}/ @@ -405,11 +406,11 @@ fi %{_mandir}/man5/*.5.gz %{_mandir}/man8/*.8.gz %{_bindir}/%{name} -%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 %{_libexecdir}/%{name} %{_unitdir}/%{name}.service %config(noreplace) %{_sysconfdir}/sysconfig/%{name} @@ -457,6 +458,9 @@ fi %{_bindir}/forward-journald %changelog +* Fri Apr 1 2016 Johnny Hughes - 1.9.1-25 +- - Manual CentOS debreanding + * Wed Mar 23 2016 Lokesh Mandvekar - 1.9.1-25 - Resolves: rhbz#1320302 - Backport fix for --cgroup-parent in docker - same commits as release -24, only added bug number