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

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 9a435e3a662f97fad9b8b6200ef96378156ec82f..2d913bd7d716733b6e76f8474da1a2eec7a7ab73 100644 (file)
--- 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 c8141639b6bc329dbaeb717143de1cc9099485a5..e8d1fff7ab5c34df1e52fac9ad0d2b7a32f28017 100644 (file)
--- 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