From: Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Date: Thu, 9 Feb 2017 15:28:37 +0000 (-0500)
Subject: Introduce '## ' as internal comment prefix in .in files and filter out a comment... 
X-Git-Tag: v233~128
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9c0f732c62b18304973f1ede23d4a48191f5db43;p=thirdparty%2Fsystemd.git

Introduce '## ' as internal comment prefix in .in files and filter out a comment (#5289)

Sometimes we have comments which don't make sense outside of the systemd
codebase, so let's filter them out from the user-visible files.

Fixes #5286.
---

diff --git a/Makefile.am b/Makefile.am
index 9a435e3a662..2d913bd7d71 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -6244,6 +6244,7 @@ substitutions = \
 SED_PROCESS = \
 	$(AM_V_GEN)$(MKDIR_P) $(dir $@) && \
 	$(SED) $(subst '|,-e 's|@,$(subst =,\@|,$(subst |',|g',$(substitutions)))) \
+                -e '/^\#\# /d' \
 		< $< > $@
 
 units/%: units/%.in
diff --git a/units/systemd-nspawn@.service.in b/units/systemd-nspawn@.service.in
index c8141639b6b..e8d1fff7ab5 100644
--- a/units/systemd-nspawn@.service.in
+++ b/units/systemd-nspawn@.service.in
@@ -22,9 +22,9 @@ Slice=machine.slice
 Delegate=yes
 TasksMax=16384
 
-# Enforce a strict device policy, similar to the one nspawn configures
-# when it allocates its own scope unit. Make sure to keep these
-# policies in sync if you change them!
+## Enforce a strict device policy, similar to the one nspawn configures
+## when it allocates its own scope unit. Make sure to keep these
+## policies in sync if you change them!
 DevicePolicy=closed
 DeviceAllow=/dev/net/tun rwm
 DeviceAllow=char-pts rw