shaba/ostree
1
0
Fork 0
mirror of https://github.com/ostreedev/ostree.git synced 2025-02-18 21:58:01 +03:00
Code Issues Projects Releases Wiki Activity

deploy: Use semodule --refresh if available

Browse Source 
Current FCOS emits a warning:

```
[root@cosa-devsh ~]# journalctl -b -1 -u ostree-finalize-staged --grep=deprecated
Nov 01 20:21:21 cosa-devsh ostree[2481]: The --rebuild-if-modules-changed option is deprecated. Use --refresh instead.
[root@cosa-devsh ~]#
```
This commit is contained in:
Colin Walters 2022-11-01 16:22:45 -04:00
parent ba94997e99
commit f0c3d09618
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/libostree/ostree-sysroot-deploy.c
View File

@ -2923,7 +2923,7 @@ sysroot_finalize_selinux_policy (int deployment_dfd, GError **error)
return TRUE;
/*
* Skip the SELinux policy refresh if the --rebuild-if-modules-changed
* Skip the SELinux policy refresh if the --refresh
* flag is not supported by semodule.
*/
static const gchar * const SEMODULE_HELP_ARGV[] = {
@ -2935,14 +2935,14 @@ sysroot_finalize_selinux_policy (int deployment_dfd, GError **error)
return FALSE;
if (!g_spawn_check_exit_status (exit_status, error))
return glnx_prefix_error (error, "failed to run semodule");
if (!strstr(stdout, "--rebuild-if-modules-changed"))
if (!strstr(stdout, "--refresh"))
{
ot_journal_print (LOG_INFO, "semodule does not have --rebuild-if-modules-changed");
ot_journal_print (LOG_INFO, "semodule does not have --refresh");
return TRUE;
}
static const gchar * const SEMODULE_REBUILD_ARGV[] = {
"semodule", "-N", "--rebuild-if-modules-changed"
"semodule", "-N", "--refresh"
};
static const gsize SEMODULE_REBUILD_ARGC = sizeof (SEMODULE_REBUILD_ARGV) / sizeof (*SEMODULE_REBUILD_ARGV);