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

[William Hubbs]

commit:     4f784bd46923486773edcd7749246a21bd419e6b
Author:     Jason Zaman <jason <AT> perfinion <DOT> com>
AuthorDate: Tue Jul 15 18:27:32 2014 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Wed Jul 16 15:53:25 2014 +0000
URL:        
http://git.overlays.gentoo.org/gitweb/?p=proj/openrc.git;a=commit;h=4f784bd4

tmpfiles: set the proper SELinux context

Restore the label on the created file / dir based on the policy
fcontexts.

X-Gentoo-Bug: 516956
X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=516956

---
 sh/tmpfiles.sh.in | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/sh/tmpfiles.sh.in b/sh/tmpfiles.sh.in
index 66612fc..da64011 100755
--- a/sh/tmpfiles.sh.in
+++ b/sh/tmpfiles.sh.in
@@ -52,12 +52,20 @@ relabel() {
        done
 }
 
+_restorecon() {
+    local path=$1
+    if [ -x /sbin/restorecon ]; then
+        dryrun_or_real restorecon -F "$path"
+    fi
+}
+
 _b() {
        # Create a block device node if it doesn't exist yet
        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"
        fi
 }
 
@@ -67,6 +75,7 @@ _c() {
        if [ ! -e "$path" ]; then
                dryrun_or_real mknod -m $mode $path c ${arg%:*} ${arg#*:}
                dryrun_or_real chown $uid:$gid $path
+               _restorecon "$path"
        fi
 }
 
@@ -80,6 +89,7 @@ _f() {
        if [ ! -e "$path" ]; then
                dryrun_or_real install -m"$mode" -o"$uid" -g"$gid" /dev/null 
"$path"
                [ -z "$arg" ] || _w "$@"
+               _restorecon "$path"
        fi
 }
 
@@ -91,6 +101,7 @@ _F() {
 
        dryrun_or_real install -m"$mode" -o"$uid" -g"$gid" /dev/null "$path"
        [ -z "$arg" ] || _w "$@"
+       _restorecon "$path"
 }
 
 _d() {
@@ -101,6 +112,7 @@ _d() {
 
        if [ ! -d "$path" ]; then
                dryrun_or_real install -d -m"$mode" -o"$uid" -g"$gid" "$path"
+               _restorecon "$path"
        fi
 }
 
@@ -110,10 +122,12 @@ _D() {
 
        if [ -d "$path" ] && [ $REMOVE -gt 0 ]; then
                dryrun_or_real find "$path" -mindepth 1 -maxdepth 1 -xdev -exec 
rm -rf {} +
+               _restorecon "$path"
        fi
 
        if [ $CREATE -gt 0 ]; then
                dryrun_or_real install -d -m"$mode" -o"$uid" -g"$gid" "$path"
+               _restorecon "$path"
        fi
 }
 
@@ -121,6 +135,7 @@ _L() {
        # Create a symlink if it doesn't exist yet
        local path=$1 mode=$2 uid=$3 gid=$4 age=$5 arg=$6
        [ ! -e "$path" ] && dryrun_or_real ln -s "$arg" "$path"
+       _restorecon "$path"
 }
 
 _p() {
@@ -132,6 +147,7 @@ _p() {
        if [ ! -p "$path" ]; then
                dryrun_or_real mkfifo -m$mode "$path"
                dryrun_or_real chown "$uid:$gid" "$path"
+               _restorecon "$path"
        fi
 }