aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Gregory <andrew.gregory.8@gmail.com>2014-03-27 11:02:47 -0400
committerAndrew Gregory <andrew.gregory.8@gmail.com>2014-03-27 11:36:41 -0400
commitc081633762dc66235fe385eedcc2cdf6bff83391 (patch)
tree5d952ab9d7f757258d645e00166df3ff128bc798
parente0e1f2a4da376d9d05487ec23922c1ca356cbbc6 (diff)
tmpfiles: ignore all files starting with systemd-
systemd recently moved creation of /run/nologin to systemd-nologin.conf Signed-off-by: Andrew Gregory <andrew.gregory.8@gmail.com>
-rwxr-xr-xsh/tmpfiles.sh.in4
1 files changed, 3 insertions, 1 deletions
diff --git a/sh/tmpfiles.sh.in b/sh/tmpfiles.sh.in
index 1a263f22..da588e21 100755
--- a/sh/tmpfiles.sh.in
+++ b/sh/tmpfiles.sh.in
@@ -230,7 +230,9 @@ 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
+ case "${f##*/}" in
+ systemd.conf|systemd-*.conf) continue;;
+ esac
[ -f $f ] && tmpfiles_basenames="${tmpfiles_basenames}\n${f##*/}"
done # for f in ${d}
done # for d in ${tmpfiles_dirs}