aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWilliam Hubbs <w.d.hubbs@gmail.com>2012-10-21 14:45:45 -0500
committerWilliam Hubbs <w.d.hubbs@gmail.com>2012-10-21 14:50:29 -0500
commit74c6b554bcdbed5e41c9d6dde16bf636bfa8a758 (patch)
tree5bd0b5e9fd6e8c0a94a80fe9f7bf3b6c67b23323
parente8acdc6f856075d31dc16563ba03ab21eed3edf8 (diff)
tmpfiles: do not process systemd.conf
This file contains definitions specific to systemd, so we should not process it. Reported-by: <andrew.gregory.8@gmail.com>
-rwxr-xr-xsh/tmpfiles.sh.in1
1 files changed, 1 insertions, 0 deletions
diff --git a/sh/tmpfiles.sh.in b/sh/tmpfiles.sh.in
index a341845c..2486da22 100755
--- a/sh/tmpfiles.sh.in
+++ b/sh/tmpfiles.sh.in
@@ -201,6 +201,7 @@ tmpfiles_d=''
# `/run/tmpfiles/foo.conf' will always be read after `/etc/tmpfiles.d/bar.conf'
for d in ${tmpfiles_dirs} ; do
[ -d $d ] && for f in ${d}/*.conf ; do
+ [ "$f" = "$d/systemd.conf" ] && continue
[ -f $f ] && tmpfiles_basenames="${tmpfiles_basenames}\n${f##*/}"
done # for f in ${d}
done # for d in ${tmpfiles_dirs}