Merge pull request #16321 from bluca/mount_images

core: new feature MountImages

diff --git a/TODO b/TODO
index 88fd20ad3eda0050e33e71bfc1060998c4541da3..a9d4ee35a973d7c4adc35751b077317af8ea39cf 100644 (file)
--- a/TODO
+++ b/TODO
@@ -27,6 +27,8 @@ Features:
   nodes to /run/host, move notify socket (for sd_notify() between payload and
   container manager)
 
+* make use of new glibc 2.32 APIs sigabbrev_np() and strerrorname_np().
+
 * cryptsetup: if keyfile specified in crypttab is AF_UNIX socket, connect to it
   and read from it (like we do elsewhere with READ_FULL_FILE_CONNECT_SOCKET)
 

diff --git a/src/systemd/_sd-common.h b/src/systemd/_sd-common.h
index 8158ee733e22e57f9e7c7e6508fbeda129346fa8..1055b00d0767d7f72b0a87e8be2fc22ef760e349 100644 (file)
--- a/src/systemd/_sd-common.h
+++ b/src/systemd/_sd-common.h
@@ -19,7 +19,7 @@
 
 /* This is a private header; never even think of including this directly! */
 
-#if defined(__INCLUDE_LEVEL__) && __INCLUDE_LEVEL__ <= 1
+#if defined(__INCLUDE_LEVEL__) && __INCLUDE_LEVEL__ <= 1 && !defined(__COVERITY__)
 #  error "Do not include _sd-common.h directly; it is a private header."
 #endif