|
 |
2d15635 |
From ce6906933486400d6a579e6fddd0b39a46b14db8 Mon Sep 17 00:00:00 2001
|
|
|
2d15635 |
From: Lennart Poettering <lennart@poettering.net>
|
|
|
2d15635 |
Date: Mon, 11 Aug 2014 16:41:05 +0200
|
|
|
2d15635 |
Subject: [PATCH] man: document that we look for both the instance's and the
|
|
|
2d15635 |
template's .d/ directory when looking for unit file drop-ins.
|
|
|
2d15635 |
|
|
|
2d15635 |
(cherry picked from commit 96ddbf819a5675dba23ffadc35099462fdb2579f)
|
|
|
2d15635 |
---
|
|
|
2d15635 |
man/systemd.unit.xml | 7 ++++++-
|
|
|
2d15635 |
1 file changed, 6 insertions(+), 1 deletion(-)
|
|
|
2d15635 |
|
|
|
2d15635 |
diff --git a/man/systemd.unit.xml b/man/systemd.unit.xml
|
|
|
2d15635 |
index eb8b13deee..b94555f406 100644
|
|
|
2d15635 |
--- a/man/systemd.unit.xml
|
|
|
2d15635 |
+++ b/man/systemd.unit.xml
|
|
|
2d15635 |
@@ -198,7 +198,12 @@
|
|
|
2d15635 |
settings to a unit, without having to modify their
|
|
|
2d15635 |
unit files. Make sure that the file that is included
|
|
|
2d15635 |
has the appropriate section headers before any
|
|
|
2d15635 |
- directive.</para>
|
|
|
2d15635 |
+ directive. Note that for instanced units this logic
|
|
|
2d15635 |
+ will first look for the instance
|
|
|
2d15635 |
+ <literal>.d/</literal> subdirectory and read its
|
|
|
2d15635 |
+ <literal>.conf</literal> files, followed by the
|
|
|
2d15635 |
+ template <literal>.d/</literal> subdirectory and reads
|
|
|
2d15635 |
+ its <literal>.conf</literal> files.</para>
|
|
|
2d15635 |
|
|
|
2d15635 |
<para>If a line starts with <option>.include</option>
|
|
|
2d15635 |
followed by a filename, the specified file will be
|