diff options
| author | William Hubbs <w.d.hubbs@gmail.com> | 2015-04-01 10:55:09 -0500 |
|---|---|---|
| committer | William Hubbs <w.d.hubbs@gmail.com> | 2015-04-08 09:57:46 -0500 |
| commit | 1eab656ca1d3258ff00495710a68ad459ce50d3e (patch) | |
| tree | dd29bd80e81b348016ac84a4d6ba3a62fd08cfd2 /sh/tmpfiles.sh.in | |
| parent | 731a3affdce31e2971a84cde11df2d122049ec99 (diff) | |
Fix tmpfiles processing
Tmpfiles.d processing had /run overriding /usr/lib and /etc, but this is
not correct. The correct order, from lowest to highest, for tmpfiles
processing is:
* /usr/lib/tmpfiles.d/*.conf
* /run/tmpfiles.d/*.conf
* /etc/tmpfiles.d
This means /run/tmpfiles.d/*.conf can override /etc/tmpfiles.d/*.conf,
but /etc/tmpfiles.d/*.conf can override both of them.
This fixes #49.
Diffstat (limited to 'sh/tmpfiles.sh.in')
| -rwxr-xr-x | sh/tmpfiles.sh.in | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sh/tmpfiles.sh.in b/sh/tmpfiles.sh.in index 6e7be420..046bf9f1 100755 --- a/sh/tmpfiles.sh.in +++ b/sh/tmpfiles.sh.in @@ -245,7 +245,7 @@ PREFIX= FILE= fragments= # XXX: The harcoding of /usr/lib/ is an explicit choice by upstream -tmpfiles_dirs='/usr/lib/tmpfiles.d/ /etc/tmpfiles.d/ /run/tmpfiles.d/' +tmpfiles_dirs='/usr/lib/tmpfiles.d/ /run/tmpfiles.d/ /etc/tmpfiles.d/' tmpfiles_basenames='' tmpfiles_d='' # Build a list of sorted unique basenames |