From 5584d399ef41336323c157863fe1df34dc234a5e Mon Sep 17 00:00:00 2001
From: Johnny Hughes <johnny@centos.org>
Date: Oct 24 2017 13:41:37 +0000
Subject: Manual CentOS Debranding


---

diff --git a/SOURCES/docker-latest.service b/SOURCES/docker-latest.service
index f229e7a..464cea3 100644
--- a/SOURCES/docker-latest.service
+++ b/SOURCES/docker-latest.service
@@ -1,9 +1,8 @@
 [Unit]
 Description=Docker Application Container Engine
 Documentation=http://docs.docker.com
-After=network.target rhel-push-plugin.socket
+After=network.target
 Wants=docker-latest-storage-setup.service
-Requires=rhel-push-plugin.socket
 
 [Service]
 Type=notify
@@ -17,7 +16,6 @@ Environment=PATH=/usr/libexec/docker:/usr/bin:/usr/sbin
 ExecStart=/usr/bin/dockerd-latest \
           --add-runtime docker-runc=/usr/libexec/docker/docker-runc-latest \
           --default-runtime=docker-runc \
-          --authorization-plugin=rhel-push-plugin \
           --exec-opt native.cgroupdriver=systemd \
           --userland-proxy-path=/usr/libexec/docker/docker-proxy-latest \
           --seccomp-profile=/etc/docker-latest/seccomp.json \
diff --git a/SOURCES/docker-latest.sysconfig b/SOURCES/docker-latest.sysconfig
index 7bf6915..b240c20 100644
--- a/SOURCES/docker-latest.sysconfig
+++ b/SOURCES/docker-latest.sysconfig
@@ -8,7 +8,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-latest.spec b/SPECS/docker-latest.spec
index 5d7c780..81293cc 100644
--- a/SPECS/docker-latest.spec
+++ b/SPECS/docker-latest.spec
@@ -170,11 +170,6 @@ Requires: %{repo}-common
 # here keep the new line above otherwise autosetup fails when applying patch
 cp %{SOURCE9} .
 
-# rhel debranding for centos
-%if 0%{?centos}
-sed -i 's/ADD_REGISTRY/#ADD_REGISTRY/' %{SOURCE6}
-%endif
-
 # untar d-s-s
 tar zxf %{SOURCE1}
 pushd container-storage-setup-%{commit_dss}
@@ -338,17 +333,17 @@ install -p contrib/udev/80-%{repo}.rules %{buildroot}%{_udevrulesdir}/80-%{name}
 install -d %{buildroot}%{_sharedstatedir}/%{name}
 
 # install secret patch directory
-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}%{_sysconfdir}/%{name}/certs.d/redhat.{com,io}
-mkdir -p %{buildroot}/etc/%{name}/certs.d/registry.access.redhat.com
-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
-ln -s %{_sysconfdir}/rhsm/ca/redhat-uep.pem %{buildroot}%{_sysconfdir}/%{name}/certs.d/registry.access.redhat.com/redhat-ca.crt
+#mkdir -p %{buildroot}%{_sysconfdir}/%{name}/certs.d/redhat.{com,io}
+#mkdir -p %{buildroot}/etc/%{name}/certs.d/registry.access.redhat.com
+#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
+#ln -s %{_sysconfdir}/rhsm/ca/redhat-uep.pem %{buildroot}%{_sysconfdir}/%{name}/certs.d/registry.access.redhat.com/redhat-ca.crt
 
 # install systemd/init scripts
 install -d %{buildroot}%{_unitdir}
@@ -464,8 +459,8 @@ exit 0
 %{_unitdir}/%{name}-cleanup.service
 %{_unitdir}/%{name}-cleanup.timer
 %{_datadir}/bash-completion/completions/%{name}
-%dir %{_datadir}/rhel
-%{_datadir}/rhel/*
+#%dir %{_datadir}/rhel
+#%{_datadir}/rhel/*
 %dir %{_sharedstatedir}/%{name}
 %{_udevrulesdir}/80-%{name}.rules
 %dir %{_sysconfdir}/%{name}
@@ -516,6 +511,9 @@ exit 0
 %endif # with_migrator
 
 %changelog
+* Tue Oct 24 2017 Johnny Hughes <johnny@centos.org> - 1.13.1-26.git1faa135
+- Manual CentOS Debranding
+
 * Tue Sep 26 2017 Lokesh Mandvekar <lsm5@redhat.com> - 1.13.1-26.git1faa135
 - reverted sources, the same file shouldn't have a different hash