From 0f813c17589416f13f9d662ee98558d57213dd17 Mon Sep 17 00:00:00 2001 From: Colin Walters Date: Wed, 17 Oct 2018 18:31:52 +0000 Subject: [PATCH] scripts: Fully neuter microcode_ctl scripts everywhere I swear I tested the previous PR here but it looks like they did a new build recently whose release ends in `el7_5` which no longer matches. Since the Fedora spec doesn't have any scripts, let's go back to using the gperf list. Closes: #1623 Approved by: jlebon --- src/libpriv/rpmostree-script-gperf.gperf | 2 ++ src/libpriv/rpmostree-scripts.c | 4 ---- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/src/libpriv/rpmostree-script-gperf.gperf b/src/libpriv/rpmostree-script-gperf.gperf index 24215f1c..659fd232 100644 --- a/src/libpriv/rpmostree-script-gperf.gperf +++ b/src/libpriv/rpmostree-script-gperf.gperf @@ -39,5 +39,7 @@ systemd.transfiletriggerin, RPMOSTREE_SCRIPT_ACTION_IGNORE man-db.transfiletriggerin, RPMOSTREE_SCRIPT_ACTION_IGNORE # https://src.fedoraproject.org/rpms/nfs-utils/pull-request/1 nfs-utils.post, RPMOSTREE_SCRIPT_ACTION_IGNORE +# There is some totally insane stuff going on here in RHEL7 +microcode_ctl.post, RPMOSTREE_SCRIPT_ACTION_IGNORE # https://bugzilla.redhat.com/show_bug.cgi?id=1199582 microcode_ctl.posttrans, RPMOSTREE_SCRIPT_ACTION_IGNORE diff --git a/src/libpriv/rpmostree-scripts.c b/src/libpriv/rpmostree-scripts.c index 3c540464..ab33f05c 100644 --- a/src/libpriv/rpmostree-scripts.c +++ b/src/libpriv/rpmostree-scripts.c @@ -180,10 +180,6 @@ static const RpmOstreeScriptReplacement script_replacements[] = { * https://src.fedoraproject.org/rpms/pam/pull-request/3 */ { "pam.post", ".el7", NULL, NULL }, - /* Same here. */ - { "microcode_ctl.post", ".el7", NULL, NULL }, - /* And this one runs dracut, which we don't want. */ - { "microcode_ctl.posttrans", ".el7", NULL, NULL }, }; static gboolean