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.
This commit is contained in:
William Hubbs 2015-04-01 10:55:09 -05:00
parent 731a3affdc
commit 1eab656ca1

View File

@ -245,7 +245,7 @@ PREFIX=
FILE= FILE=
fragments= fragments=
# XXX: The harcoding of /usr/lib/ is an explicit choice by upstream # 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_basenames=''
tmpfiles_d='' tmpfiles_d=''
# Build a list of sorted unique basenames # Build a list of sorted unique basenames