[Pkg-xen-changes] [xen] 01/01: Apply SELinux labels to directories created by initscripts.

[Ian James Campbell]

This is an automated email from the git hooks/post-receive script.

ijc pushed a commit to branch feature/bug764912
in repository xen.

commit 1641338a9164368e7395bdc8d10d7bdfa82fde45
Author: Ian Campbell <ijc at hellion.org.uk>
Date:   Thu Nov 6 11:32:39 2014 +0000

    Apply SELinux labels to directories created by initscripts.
    
    Patch from Russell Coker. (Closes: #764912)
---
 debian/changelog                 | 8 ++++++++
 debian/xen-utils-common.xen.init | 2 ++
 2 files changed, 10 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 7caff4d..9a85a36 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+xen (4.4.1-5) UNRELEASED; urgency=medium
+
+  [ Ian Campbell ]
+  * Apply SELinux labels to directories created by initscripts. Patch from
+    Russell Coker. (Closes: #764912)
+
+ -- Ian Campbell <ijc at debian.org>  Thu, 06 Nov 2014 11:31:42 +0000
+
 xen (4.4.1-4) UNRELEASED; urgency=medium
 
   [ Bastian Blank ]
diff --git a/debian/xen-utils-common.xen.init b/debian/xen-utils-common.xen.init
index b903877..3b98beb 100644
--- a/debian/xen-utils-common.xen.init
+++ b/debian/xen-utils-common.xen.init
@@ -66,6 +66,7 @@ env_setup()
 	[ -d /run/xen ] && return 0
 
 	mkdir -m 700 /run/xen
+	[ -x /sbin/restorecon ] && /sbin/restorecon /run/xen
 }
 
 xend_start()
@@ -189,6 +190,7 @@ xenstored_start()
 	start-stop-daemon --start --quiet --pidfile "$XENSTORED_PIDFILE" --exec "$XENSTORED" --test > /dev/null \
 		|| return 1
 	[ -d "$XENSTORED_DIR" ] || mkdir -p "$XENSTORED_DIR"
+	[ -x /sbin/restorecon ] && /sbin/restorecon "$XENSTORED_DIR"
 	export XENSTORED_ROOTDIR="$XENSTORED_DIR"
 	start-stop-daemon --start --quiet --pidfile "$XENSTORED_PIDFILE" --exec "$XENSTORED" -- \
 		$XENSTORED_ARGS --pid-file="$XENSTORED_PIDFILE" \

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-xen/xen.git