Merge pull request #612 from marineam/systemd

fix(sys-apps/systemd): Stop warning about "X-Fleet" sections

sdk_container/src/third_party/coreos-overlay/sys-apps/systemd/files/212-0005-conf-parser-silently-ignore-sections-starting-with-X.patch

@@ -0,0 +1,73 @@
+From 92b626e34454aa14b51a9b21a1e885806c10d2fb Mon Sep 17 00:00:00 2001
+From: Michael Marineau <michael.marineau@coreos.com>
+Date: Fri, 16 May 2014 16:03:38 -0700
+Subject: [PATCH 5/5] conf-parser: silently ignore sections starting with "X-"
+
+This allows external tools to keep additional unit information in a
+separate section without scaring users with a big warning.
+---
+ src/shared/conf-parser.c | 9 +++++++--
+ 1 file changed, 7 insertions(+), 2 deletions(-)
+
+diff --git a/src/shared/conf-parser.c b/src/shared/conf-parser.c
+index d27b1b7..062b15b 100644
+--- a/src/shared/conf-parser.c
++++ b/src/shared/conf-parser.c
+@@ -204,6 +204,7 @@ static int parse_line(const char* unit,
+                       bool allow_include,
+                       char **section,
+                       unsigned *section_line,
++                      bool *section_ignored,
+                       char *l,
+                       void *userdata) {
+ 
+@@ -266,7 +267,7 @@ static int parse_line(const char* unit,
+ 
+                 if (sections && !nulstr_contains(sections, n)) {
+ 
+-                        if (!relaxed)
++                        if (!relaxed && !startswith(n, "X-"))
+                                 log_syntax(unit, LOG_WARNING, filename, line, EINVAL,
+                                            "Unknown section '%s'. Ignoring.", n);
+ 
+@@ -274,10 +275,12 @@ static int parse_line(const char* unit,
+                         free(*section);
+                         *section = NULL;
+                         *section_line = 0;
++                        *section_ignored = true;
+                 } else {
+                         free(*section);
+                         *section = n;
+                         *section_line = line;
++                        *section_ignored = false;
+                 }
+ 
+                 return 0;
+@@ -285,7 +288,7 @@ static int parse_line(const char* unit,
+ 
+         if (sections && !*section) {
+ 
+-                if (!relaxed)
++                if (!relaxed && !*section_ignored)
+                         log_syntax(unit, LOG_WARNING, filename, line, EINVAL,
+                                    "Assignment outside of section. Ignoring.");
+ 
+@@ -328,6 +331,7 @@ int config_parse(const char *unit,
+         _cleanup_free_ char *section = NULL, *continuation = NULL;
+         _cleanup_fclose_ FILE *ours = NULL;
+         unsigned line = 0, section_line = 0;
++        bool section_ignored = false;
+         int r;
+ 
+         assert(filename);
+@@ -399,6 +403,7 @@ int config_parse(const char *unit,
+                                allow_include,
+                                &section,
+                                &section_line,
++                               &section_ignored,
+                                p,
+                                userdata);
+                 free(c);
+-- 
+1.8.5.5
+

sdk_container/src/third_party/coreos-overlay/sys-apps/systemd/systemd-212-r8.ebuild

@@ -123,6 +123,9 @@ fi
 	# fix broken device dependencies after daemon-reload
 	epatch "${FILESDIR}"/212-0004-core-make-sure-to-serialize-jobs-for-all-units.patch
 
+	# stop scaring all our users with warnings about "X-Fleet"
+	epatch "${FILESDIR}"/212-0005-conf-parser-silently-ignore-sections-starting-with-X.patch
+
 	# patch to make journald work at first boot
 	epatch "${FILESDIR}"/211-tmpfiles.patch