From: Zbigniew Jędrzejewski-Szmek Date: Thu, 14 Dec 2017 09:15:41 +0000 (+0100) Subject: Make taint message structured and add catalog entry X-Git-Tag: v236~3^2~2 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=b2e7486cc7220552ecc79700ad2db7fa4666f060;p=platform%2Fupstream%2Fsystemd.git Make taint message structured and add catalog entry Dec 14 14:10:54 krowka systemd[1]: System is tainted: overflowgid-not-65534 -- Subject: The system is configured in a way that might cause problems -- Defined-By: systemd -- Support: https://lists.freedesktop.org/mailman/listinfo/systemd-devel -- -- The following "tags" are possible: -- - "split-usr" — /usr is a separate file system and was not mounted when systemd -- was booted -- - "cgroups-missing" — the kernel was compiled without cgroup support or access -- to expected interface files is resticted -- - "var-run-bad" — /var/run is not a symlink to /run -- - "overflowuid-not-65534" — the kernel user ID used for "unknown" users (with -- NFS or user namespaces) is not 65534 -- - "overflowgid-not-65534" — the kernel group ID used for "unknown" users (with -- NFS or user namespaces) is not 65534 -- Current system is tagged as overflowgid-not-65534. --- diff --git a/catalog/systemd.catalog.in b/catalog/systemd.catalog.in index 412ea8a..118fe86 100644 --- a/catalog/systemd.catalog.in +++ b/catalog/systemd.catalog.in @@ -359,3 +359,20 @@ Defined-By: systemd Support: %SUPPORT_URL% The unit @UNIT@ completed and consumed the indicated resources. + +-- 50876a9db00f4c40bde1a2ad381c3a1b +Subject: The system is configured in a way that might cause problems +Defined-By: systemd +Support: %SUPPORT_URL% + +The following "tags" are possible: +- "split-usr" — /usr is a separate file system and was not mounted when systemd + was booted +- "cgroups-missing" — the kernel was compiled without cgroup support or access + to expected interface files is resticted +- "var-run-bad" — /var/run is not a symlink to /run +- "overflowuid-not-65534" — the kernel user ID used for "unknown" users (with + NFS or user namespaces) is not 65534 +- "overflowgid-not-65534" — the kernel group ID used for "unknown" users (with + NFS or user namespaces) is not 65534 +Current system is tagged as @TAINT@. diff --git a/src/core/main.c b/src/core/main.c index d79e183..2ad5073 100644 --- a/src/core/main.c +++ b/src/core/main.c @@ -38,6 +38,7 @@ #include "sd-bus.h" #include "sd-daemon.h" +#include "sd-messages.h" #include "alloc-util.h" #include "architecture.h" @@ -2420,7 +2421,11 @@ int main(int argc, char *argv[]) { taint = manager_taint_string(m); if (!isempty(taint)) - log_notice("System is tainted: %s", taint); + log_struct(LOG_NOTICE, + LOG_MESSAGE("System is tainted: %s", taint), + "TAINT=%s", taint, + "MESSAGE_ID=" SD_MESSAGE_TAINTED_STR, + NULL); } if (arg_action == ACTION_TEST) { diff --git a/src/systemd/sd-messages.h b/src/systemd/sd-messages.h index 874329f..5a3f78b 100644 --- a/src/systemd/sd-messages.h +++ b/src/systemd/sd-messages.h @@ -70,6 +70,8 @@ _SD_BEGIN_DECLARATIONS; #define SD_MESSAGE_TIMEZONE_CHANGE SD_ID128_MAKE(45,f8,2f,4a,ef,7a,4b,bf,94,2c,e8,61,d1,f2,09,90) #define SD_MESSAGE_TIMEZONE_CHANGE_STR SD_ID128_MAKE_STR(45,f8,2f,4a,ef,7a,4b,bf,94,2c,e8,61,d1,f2,09,90) +#define SD_MESSAGE_TAINTED SD_ID128_MAKE(50,87,6a,9d,b0,0f,4c,40,bd,e1,a2,ad,38,1c,3a,1b) +#define SD_MESSAGE_TAINTED_STR SD_ID128_MAKE_STR(50,87,6a,9d,b0,0f,4c,40,bd,e1,a2,ad,38,1c,3a,1b) #define SD_MESSAGE_STARTUP_FINISHED SD_ID128_MAKE(b0,7a,24,9c,d0,24,41,4a,82,dd,00,cd,18,13,78,ff) #define SD_MESSAGE_STARTUP_FINISHED_STR SD_ID128_MAKE_STR(b0,7a,24,9c,d0,24,41,4a,82,dd,00,cd,18,13,78,ff) #define SD_MESSAGE_USER_STARTUP_FINISHED \