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 E8C0D13877A for ; Wed, 13 Aug 2014 20:29:35 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 5EF83E0CD9; Wed, 13 Aug 2014 20:29:13 +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 08E39E0CD9 for ; Wed, 13 Aug 2014 20:29:12 +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 3B00C3405A9 for ; Wed, 13 Aug 2014 20:29:12 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by spoonbill.gentoo.org (Postfix) with ESMTP id E79C018816 for ; Wed, 13 Aug 2014 20:29:10 +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: <1407961597.c8018d04a7b238b57a3d74a68e2af02af395f510.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: c8018d04a7b238b57a3d74a68e2af02af395f510 X-VCS-Branch: master Date: Wed, 13 Aug 2014 20:29:10 +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: 64d6c75f-1bc0-468d-b546-7620be2a43e0 X-Archives-Hash: 4164831a98ceaefce7b6d737e96497de Message-ID: <20140813202910.ppfwGy_8iarUaJFvtXY--P4OGLuXyRm2ieHEZWaMEE4@z> commit: c8018d04a7b238b57a3d74a68e2af02af395f510 Author: William Hubbs gmail com> AuthorDate: Wed Aug 13 20:26:37 2014 +0000 Commit: William Hubbs gentoo org> CommitDate: Wed Aug 13 20:26:37 2014 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/openrc.git;a=commit;h=c8018d04 tmpfiles: fix relabel to run restorecon before chown and chmod --- 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 8538545..42a3639 100755 --- a/sh/tmpfiles.sh.in +++ b/sh/tmpfiles.sh.in @@ -45,10 +45,10 @@ relabel() { for path in ${paths}; do if [ -e "$path" ]; then + [ -x /sbin/restorecon ] && dryrun_or_real restorecon $CHOPTS "$path" [ $uid != '-' ] && dryrun_or_real chown $CHOPTS "$uid" "$path" [ $gid != '-' ] && dryrun_or_real chgrp $CHOPTS "$gid" "$path" [ $mode != '-' ] && dryrun_or_real chmod $CHOPTS "$mode" "$path" - [ -x /sbin/restorecon ] && dryrun_or_real restorecon $CHOPTS "$path" fi done }