From: Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Date: Thu, 6 Aug 2020 16:23:03 +0000 (+0200)
Subject: Merge pull request #16321 from bluca/mount_images
X-Git-Tag: v247-rc1~446
X-Git-Url: http://git.ipfire.org/?p=thirdparty%2Fsystemd.git;a=commitdiff_plain;h=f1cc283a5ab47aae64a2bdb4cd7f1916309906ff;hp=b3d133148ea802e44ec913b2766c811ac2316f9a

Merge pull request #16321 from bluca/mount_images

core: new feature MountImages
---

diff --git a/TODO b/TODO
index 88fd20ad3ed..a9d4ee35a97 100644
--- 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 8158ee733e2..1055b00d076 100644
--- 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