[gentoo-commits] proj/openrc:master commit in: sh/

[William Hubbs]

commit:     6f080e9c1a2a9b9c308cdc03f9cf782c4ce4d440
Author:     Jason Zaman <jason <AT> perfinion <DOT> com>
AuthorDate: Wed Aug 13 06:50:34 2014 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Wed Aug 13 15:02:20 2014 +0000
URL:        
http://sources.gentoo.org/gitweb/?p=proj/openrc.git;a=commit;h=6f080e9c

tmpfiles: Move relabelling before any other calls for device nodes

Device nodes are normally never device_t so this type does not
have many permissions. After the mknod, the device should have
its label corrected before any other operations (like chmod).

---
 sh/tmpfiles.sh.in | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sh/tmpfiles.sh.in b/sh/tmpfiles.sh.in
index 63c5d14..8538545 100755
--- a/sh/tmpfiles.sh.in
+++ b/sh/tmpfiles.sh.in
@@ -65,8 +65,8 @@ _b() {
        local path=$1 mode=$2 uid=$3 gid=$4 age=$5 arg=$6
        if [ ! -e "$path" ]; then
                dryrun_or_real mknod -m $mode $path b ${arg%:*} ${arg#*:}
-               dryrun_or_real chown $uid:$gid $path
                _restorecon "$path"
+               dryrun_or_real chown $uid:$gid $path
        fi
 }
 
@@ -75,8 +75,8 @@ _c() {
        local path=$1 mode=$2 uid=$3 gid=$4 age=$5 arg=$6
        if [ ! -e "$path" ]; then
                dryrun_or_real mknod -m $mode $path c ${arg%:*} ${arg#*:}
-               dryrun_or_real chown $uid:$gid $path
                _restorecon "$path"
+               dryrun_or_real chown $uid:$gid $path
        fi
 }