[oe-commits] Wenzong Fan : iscsi-initiator-utils: fix SELinux label for initiatorname.iscsi

[git at git.openembedded.org]

Module: meta-openembedded.git
Branch: master-next
Commit: 2463751fb088957d4142f0b42abc0db1f7f1431b
URL:    http://git.openembedded.org/?p=meta-openembedded.git&a=commit;h=2463751fb088957d4142f0b42abc0db1f7f1431b

Author: Wenzong Fan <wenzong.fan at windriver.com>
Date:   Wed Feb  4 17:33:32 2015 +0800

iscsi-initiator-utils: fix SELinux label for initiatorname.iscsi

* /etc/iscsi/initiatorname.iscsi: etc_runtime_t -> etc_t

This config file was created by postinstall or initscript, fix SELinux
label for it to remove:

  avc: denied { read } for pid=6094 comm="iscsid" \
  name="initiatorname.iscsi" dev="sda3" ino=1057846 \
  scontext=system_u:system_r:iscsid_t:s0-s15:c0.c1023 \
  tcontext=system_u:object_r:etc_runtime_t:s0 tclass=file

Signed-off-by: Wenzong Fan <wenzong.fan at windriver.com>
Signed-off-by: Martin Jansa <Martin.Jansa at gmail.com>

---

 .../recipes-daemons/iscsi-initiator-utils/files/initd.debian          | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/meta-networking/recipes-daemons/iscsi-initiator-utils/files/initd.debian b/meta-networking/recipes-daemons/iscsi-initiator-utils/files/initd.debian
index 99a7638..43fb348 100644
--- a/meta-networking/recipes-daemons/iscsi-initiator-utils/files/initd.debian
+++ b/meta-networking/recipes-daemons/iscsi-initiator-utils/files/initd.debian
@@ -39,6 +39,10 @@ start() {
 InitiatorName=$INITIATORNAME
 EOF
 	fi
+
+	# Fix label for /etc/iscsi/initiatorname.iscsi if SELinux was enabled
+	test ! -x /sbin/restorecon || /sbin/restorecon -F /etc/iscsi/initiatorname.iscsi
+
 	start-stop-daemon --start --quiet --pidfile $PIDFILE --exec $DAEMON
 	RETVAL=$?
 	starttargets