keremet/rpm-ostree
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

scripts: Fully neuter microcode_ctl scripts everywhere

Browse Source 
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
This commit is contained in:
Colin Walters 2018-10-17 18:31:52 +00:00 committed by Atomic Bot
parent cdda3a01ba
commit 0f813c1758
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/libpriv/rpmostree-script-gperf.gperf
View File

@ -39,5 +39,7 @@ systemd.transfiletriggerin, RPMOSTREE_SCRIPT_ACTION_IGNORE
man-db.transfiletriggerin, RPMOSTREE_SCRIPT_ACTION_IGNORE man-db.transfiletriggerin, RPMOSTREE_SCRIPT_ACTION_IGNORE
# https://src.fedoraproject.org/rpms/nfs-utils/pull-request/1 # https://src.fedoraproject.org/rpms/nfs-utils/pull-request/1
nfs-utils.post, RPMOSTREE_SCRIPT_ACTION_IGNORE 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 # https://bugzilla.redhat.com/show_bug.cgi?id=1199582
microcode_ctl.posttrans, RPMOSTREE_SCRIPT_ACTION_IGNORE microcode_ctl.posttrans, RPMOSTREE_SCRIPT_ACTION_IGNORE

4
src/libpriv/rpmostree-scripts.c
View File

@ -180,10 +180,6 @@ static const RpmOstreeScriptReplacement script_replacements[] = {
* https://src.fedoraproject.org/rpms/pam/pull-request/3 * https://src.fedoraproject.org/rpms/pam/pull-request/3
*/ */
{ "pam.post", ".el7", NULL, NULL }, { "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 static gboolean