Browse Source

Merge pull request #22559 from larsks/bug/clarity-on-systemd-dropins

docs: note requirements for systemd drop-in filenames
Vincent Demeester 9 years ago
parent
commit
3b7a2f5816
1 changed files with 13 additions and 9 deletions
  1. 13 9
      docs/admin/systemd.md

+ 13 - 9
docs/admin/systemd.md

@@ -33,15 +33,19 @@ If you want Docker to start at boot, you should also:
 There are a number of ways to configure the daemon flags and environment variables
 There are a number of ways to configure the daemon flags and environment variables
 for your Docker daemon.
 for your Docker daemon.
 
 
-The recommended way is to use a systemd drop-in file. These are local files in
-the `/etc/systemd/system/docker.service.d` directory. This could also be
-`/etc/systemd/system/docker.service`, which also works for overriding the
-defaults from `/lib/systemd/system/docker.service`.
-
-However, if you had previously used a package which had an `EnvironmentFile`
-(often pointing to `/etc/sysconfig/docker`) then for backwards compatibility,
-you drop a file in the `/etc/systemd/system/docker.service.d`
-directory including the following:
+The recommended way is to use a systemd drop-in file (as described in
+the <a target="_blank"
+href="https://www.freedesktop.org/software/systemd/man/systemd.unit.html">systemd.unit</a>
+documentation). These are local files named `<something>.conf` in the
+`/etc/systemd/system/docker.service.d` directory. This could also be
+`/etc/systemd/system/docker.service`, which also works for overriding
+the defaults from `/lib/systemd/system/docker.service`.
+
+However, if you had previously used a package which had an
+`EnvironmentFile` (often pointing to `/etc/sysconfig/docker`) then for
+backwards compatibility, you drop a file with a `.conf` extension into
+the `/etc/systemd/system/docker.service.d` directory including the
+following:
 
 
     [Service]
     [Service]
     EnvironmentFile=-/etc/sysconfig/docker
     EnvironmentFile=-/etc/sysconfig/docker