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 BEDE3138A6C for ; Wed, 8 Apr 2015 15:33:25 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 6CD25E09C4; Wed, 8 Apr 2015 15:33:25 +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 0500FE09C4 for ; Wed, 8 Apr 2015 15:33:24 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 3BFEE34085A for ; Wed, 8 Apr 2015 15:33:24 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id E637D157C5 for ; Wed, 8 Apr 2015 15:33:22 +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: <1428505066.1eab656ca1d3258ff00495710a68ad459ce50d3e.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: 1eab656ca1d3258ff00495710a68ad459ce50d3e X-VCS-Branch: master Date: Wed, 8 Apr 2015 15:33:22 +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: 07bbbf34-4e33-429b-8d02-d6cb0ff6d91d X-Archives-Hash: c9abf07b8059339fdf9edda7028206ec commit: 1eab656ca1d3258ff00495710a68ad459ce50d3e Author: William Hubbs gmail com> AuthorDate: Wed Apr 1 15:55:09 2015 +0000 Commit: William Hubbs gentoo org> CommitDate: Wed Apr 8 14:57:46 2015 +0000 URL: https://gitweb.gentoo.org/proj/openrc.git/commit/?id=1eab656c Fix tmpfiles processing Tmpfiles.d processing had /run overriding /usr/lib and /etc, but this is not correct. The correct order, from lowest to highest, for tmpfiles processing is: * /usr/lib/tmpfiles.d/*.conf * /run/tmpfiles.d/*.conf * /etc/tmpfiles.d This means /run/tmpfiles.d/*.conf can override /etc/tmpfiles.d/*.conf, but /etc/tmpfiles.d/*.conf can override both of them. This fixes #49. sh/tmpfiles.sh.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sh/tmpfiles.sh.in b/sh/tmpfiles.sh.in index 6e7be42..046bf9f 100755 --- a/sh/tmpfiles.sh.in +++ b/sh/tmpfiles.sh.in @@ -245,7 +245,7 @@ PREFIX= FILE= fragments= # XXX: The harcoding of /usr/lib/ is an explicit choice by upstream -tmpfiles_dirs='/usr/lib/tmpfiles.d/ /etc/tmpfiles.d/ /run/tmpfiles.d/' +tmpfiles_dirs='/usr/lib/tmpfiles.d/ /run/tmpfiles.d/ /etc/tmpfiles.d/' tmpfiles_basenames='' tmpfiles_d='' # Build a list of sorted unique basenames