From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 063E41387FD for ; Thu, 3 Apr 2014 18:05:21 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 3E8C2E0AFF; Thu, 3 Apr 2014 18:05:20 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id C6993E0AFF for ; Thu, 3 Apr 2014 18:05:19 +0000 (UTC) Received: from spoonbill.gentoo.org (spoonbill.gentoo.org [81.93.255.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id ED11933FD58 for ; Thu, 3 Apr 2014 18:05:18 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by spoonbill.gentoo.org (Postfix) with ESMTP id 51C2218874 for ; Thu, 3 Apr 2014 18:05:16 +0000 (UTC) From: "William Hubbs" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "William Hubbs" Message-ID: <1395934601.c081633762dc66235fe385eedcc2cdf6bff83391.williamh@OpenRC> Subject: [gentoo-commits] proj/openrc:master commit in: sh/ X-VCS-Repository: proj/openrc X-VCS-Files: sh/tmpfiles.sh.in X-VCS-Directories: sh/ X-VCS-Committer: williamh X-VCS-Committer-Name: William Hubbs X-VCS-Revision: c081633762dc66235fe385eedcc2cdf6bff83391 X-VCS-Branch: master Date: Thu, 3 Apr 2014 18:05:16 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 99c30074-4961-4613-93c0-8c380e5e9654 X-Archives-Hash: f5d01a8b11fe27bb953e9cf3699f0216 commit: c081633762dc66235fe385eedcc2cdf6bff83391 Author: Andrew Gregory gmail com> AuthorDate: Thu Mar 27 15:02:47 2014 +0000 Commit: William Hubbs gentoo org> CommitDate: Thu Mar 27 15:36:41 2014 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/openrc.git;a=commit;h=c0816337 tmpfiles: ignore all files starting with systemd- systemd recently moved creation of /run/nologin to systemd-nologin.conf Signed-off-by: Andrew Gregory gmail.com> --- 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 1a263f2..da588e2 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}