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

scripts: Neuter RHEL7 pam and microcode_ctl

Browse Source 
This gets me close to doing a build with `--unified-core`, but
now I'm tripping over a weird issue with the locale archive.  I think
it's related to the lua override.

Closes: #1612
Approved by: jlebon
This commit is contained in:
Colin Walters 2018-10-12 21:09:31 +00:00 committed by Atomic Bot
parent 13c7bcaccb
commit cc3d3a4a19
1 changed files with 36 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -158,7 +158,25 @@ static const RpmOstreeLuaReplacement lua_replacements[] = {
"/usr/bin/sh", "/usr/bin/sh",
"set -euo pipefail\n" "set -euo pipefail\n"
"echo %{_install_langs} >/usr/share/rpmostree-lua-override-test-expand\n" "echo %{_install_langs} >/usr/share/rpmostree-lua-override-test-expand\n"
}, }
};
typedef struct {
const char *pkgname_script;
const char *release_suffix;
const char *interp;
const char *replacement;
} RpmOstreeScriptReplacement;
static const RpmOstreeScriptReplacement script_replacements[] = {
/* Only neuter the rhel7 version; the Fedora one is fixed.
* 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 static gboolean
@ -487,10 +505,10 @@ impl_run_rpm_script (const KnownRpmScriptKind *rpmscript,
const char *script; const char *script;
const char *interp = (args && args[0]) ? args[0] : "/bin/sh"; const char *interp = (args && args[0]) ? args[0] : "/bin/sh";
const char *pkg_scriptid = glnx_strjoina (dnf_package_get_name (pkg), ".", rpmscript->desc + 1);
if (g_str_equal (interp, lua_builtin)) if (g_str_equal (interp, lua_builtin))
{ {
/* This is a lua script; look for a built-in override/replacement */ /* This is a lua script; look for a built-in override/replacement */
const char *pkg_scriptid = glnx_strjoina (dnf_package_get_name (pkg), ".", rpmscript->desc + 1);
gboolean found_replacement = FALSE; gboolean found_replacement = FALSE;
for (guint i = 0; i < G_N_ELEMENTS (lua_replacements); i++) for (guint i = 0; i < G_N_ELEMENTS (lua_replacements); i++)
{ {
@ -512,6 +530,22 @@ impl_run_rpm_script (const KnownRpmScriptKind *rpmscript,
else else
{ {
script = headerGetString (hdr, rpmscript->tag); script = headerGetString (hdr, rpmscript->tag);
for (guint i = 0; i < G_N_ELEMENTS (script_replacements); i++)
{
const RpmOstreeScriptReplacement *repl = &script_replacements[i];
if (!g_str_equal (repl->pkgname_script, pkg_scriptid))
continue;
if (repl->release_suffix &&
!g_str_has_suffix (dnf_package_get_release (pkg), repl->release_suffix))
continue;
/* Is this completely suppressing the script? If so, we're done */
if (!repl->interp)
return TRUE;
interp = repl->interp;
script = repl->replacement;
break;
}
} }
g_autofree char *script_owned = NULL; g_autofree char *script_owned = NULL;
g_assert (script); g_assert (script);