From 09490877a03399d02536e9c012f816f0d1f501b1 Mon Sep 17 00:00:00 2001
From: "Brian C. Lane" <bcl@redhat.com>
Date: Mon, 4 Nov 2013 09:54:48 -0800
Subject: [PATCH] Install subscription-manager (#1026304)

Only use the product-id plugin.

Resolves: rhbz#1026304
---
 share/runtime-cleanup.tmpl | 4 ++++
 share/runtime-install.tmpl | 3 +++
 2 files changed, 7 insertions(+)

diff --git a/share/runtime-cleanup.tmpl b/share/runtime-cleanup.tmpl
index 52230efb..5e4043a4 100644
--- a/share/runtime-cleanup.tmpl
+++ b/share/runtime-cleanup.tmpl
@@ -337,6 +337,10 @@ removefrom ${product.name}-logos /etc/*
 removefrom ${product.name}-logos /usr/share/icons/{Bluecurve,oxygen}/*
 removefrom ${product.name}-logos /usr/share/{firstboot,gnome-screensaver,kde4,pixmaps}/*
 
+## RHEL cleanups
+removefrom subscription-manager --allbut /etc/rhsm/* /usr/share/rhsm/* /var/log/rhsm/* \
+    /etc/yum/pluginconf.d/product-id.conf /usr/lib/yum-plugins/product-id.py
+
 ## cleanup_python_files()
 runcmd find ${root} -name "*.pyo" -type f -delete
 runcmd find ${root} -name "*.pyc" -type f -exec ln -sf /dev/null {} \;
diff --git a/share/runtime-install.tmpl b/share/runtime-install.tmpl
index 3458cdc9..4d9fb434 100644
--- a/share/runtime-install.tmpl
+++ b/share/runtime-install.tmpl
@@ -141,5 +141,8 @@ installpkg gdisk
 ## yum plugins
 installpkg yum-langpacks
 
+## RHEL packages
+installpkg subscription-manager
+
 ## actually install all the requested packages
 run_pkg_transaction