diff options
| author | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2017-02-09 10:28:37 -0500 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2017-02-09 16:28:37 +0100 |
| commit | 9c0f732c62b18304973f1ede23d4a48191f5db43 (patch) | |
| tree | 1b676ebeb92c135643309718f40dcc653bc395b9 | |
| parent | 1d450bda706abedb6724cc2c0f834ebc1686309f (diff) | |
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.
| -rw-r--r-- | Makefile.am | 1 | ||||
| -rw-r--r-- | units/systemd-nspawn@.service.in | 6 |
2 files changed, 4 insertions, 3 deletions
diff --git a/Makefile.am b/Makefile.am index 9a435e3a66..2d913bd7d7 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 c8141639b6..e8d1fff7ab 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 |