Merge pull request #18470 from mrc0mmand/ci-clang-12

ci: run build test with clang-12 as well
This commit is contained in:
Luca Boccassi
2021-02-09 13:06:40 +00:00
committed by GitHub
3 changed files with 12 additions and 11 deletions
+2 -2
View File
@@ -2214,8 +2214,8 @@ int dissected_image_acquire_metadata(DissectedImage *m) {
[META_HOSTNAME] = "/etc/hostname\0",
[META_MACHINE_ID] = "/etc/machine-id\0",
[META_MACHINE_INFO] = "/etc/machine-info\0",
[META_OS_RELEASE] = "/etc/os-release\0"
"/usr/lib/os-release\0",
[META_OS_RELEASE] = ("/etc/os-release\0"
"/usr/lib/os-release\0"),
};
_cleanup_strv_free_ char **machine_info = NULL, **os_release = NULL;