aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVincent S. Cojot <vincent@cojot.name>2017-02-23 09:38:24 -0500
committerVincent S. Cojot <vincent@cojot.name>2017-03-01 11:11:52 -0500
commitd76ef528137aa55b96c4e2914c0c0284d979dac0 (patch)
tree560a184004f2ca6567b0786d6cb4e55ef45724bb
parent1ab18342023458c58e6771b94c22ede89c917af3 (diff)
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> (cherry picked from commit 87569bd5711eaf79c1a3f0a4449daef860626daa)
-rw-r--r--extraconfig/pre_deploy/rhel-registration/scripts/rhel-registration2
1 files changed, 1 insertions, 1 deletions
diff --git a/extraconfig/pre_deploy/rhel-registration/scripts/rhel-registration b/extraconfig/pre_deploy/rhel-registration/scripts/rhel-registration
index 4c9e08ef..6f83cc4b 100644
--- a/extraconfig/pre_deploy/rhel-registration/scripts/rhel-registration
+++ b/extraconfig/pre_deploy/rhel-registration/scripts/rhel-registration
@@ -213,7 +213,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)