From: Vincent S. Cojot <vincent@cojot.name>
Date: Thu, 23 Feb 2017 14:38:24 +0000 (-0500)
Subject: Use --disable= in subscription-manager to avoid shell expansion.
X-Git-Tag: opnfv-6.0.0~984^2
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=87569bd5711eaf79c1a3f0a4449daef860626daa;p=apex-tripleo-heat-templates.git

Use --disable= in subscription-manager to avoid shell expansion.

In extraconfig/pre_deploy/rhel-registration/scripts/rhel-registration,
there's a line that says:

   retry subscription-manager repos --disable '*'

I believe this is broken and will result in shell expansion being made.
The proper line should be:

   retry subscription-manager repos --disable='*'

This regression came from commit 2b06ed8adce2bcc18480b71c0f20a0ec2d21de19.
(Also see https://review.openstack.org/#/c/381233 )

This patch fixes the regression while preserving functionality
of the above change.

Closes-Bug: 1667316

Change-Id: I54f0db3f1f596f6356f7445cdc61737f20f14318
Signed-off-by: Vincent S. Cojot <vincent@cojot.name>
---

diff --git a/extraconfig/pre_deploy/rhel-registration/scripts/rhel-registration b/extraconfig/pre_deploy/rhel-registration/scripts/rhel-registration
index 2650a967..156f9314 100644
--- a/extraconfig/pre_deploy/rhel-registration/scripts/rhel-registration
+++ b/extraconfig/pre_deploy/rhel-registration/scripts/rhel-registration
@@ -133,7 +133,7 @@ case "${REG_METHOD:-}" in
         if [ -z "${REG_AUTO_ATTACH:-}" -a -z "${REG_ACTIVATION_KEY:-}" ]; then
             retry subscription-manager attach $attach_opts
         fi
-        retry subscription-manager repos --disable '*'
+        retry subscription-manager repos --disable='*'
         retry subscription-manager $repos
         ;;
     satellite)