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>
This commit is contained in:
Andrew Gregory 2014-03-27 11:02:47 -04:00
parent e0e1f2a4da
commit c081633762

View File

@ -230,7 +230,9 @@ tmpfiles_d=''
# `/run/tmpfiles/foo.conf' will always be read after `/etc/tmpfiles.d/bar.conf' # `/run/tmpfiles/foo.conf' will always be read after `/etc/tmpfiles.d/bar.conf'
for d in ${tmpfiles_dirs} ; do for d in ${tmpfiles_dirs} ; do
[ -d $d ] && for f in ${d}/*.conf ; 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##*/}" [ -f $f ] && tmpfiles_basenames="${tmpfiles_basenames}\n${f##*/}"
done # for f in ${d} done # for f in ${d}
done # for d in ${tmpfiles_dirs} done # for d in ${tmpfiles_dirs}