From c081633762dc66235fe385eedcc2cdf6bff83391 Mon Sep 17 00:00:00 2001 From: Andrew Gregory Date: Thu, 27 Mar 2014 11:02:47 -0400 Subject: [PATCH] tmpfiles: ignore all files starting with systemd- systemd recently moved creation of /run/nologin to systemd-nologin.conf Signed-off-by: Andrew Gregory --- sh/tmpfiles.sh.in | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) 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}