From: Dwight Engen <dwight.engen@oracle.com>
Date: Fri, 6 Dec 2013 14:46:19 +0000 (-0500)
Subject: oracle: fix chcon warning when selinux disabled
X-Git-Tag: lxc-1.0.0.beta1~49
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=341c97180674dc4d55d356a6857d788d45708ced;p=thirdparty%2Flxc.git

oracle: fix chcon warning when selinux disabled

Signed-off-by: Dwight Engen <dwight.engen@oracle.com>
Acked-by: Stéphane Graber <stgraber@ubuntu.com>
---

diff --git a/templates/lxc-oracle.in b/templates/lxc-oracle.in
index 67e46ab7e..3461e739d 100644
--- a/templates/lxc-oracle.in
+++ b/templates/lxc-oracle.in
@@ -46,6 +46,15 @@ is_btrfs_subvolume()
     return 1
 }
 
+can_chcon()
+{
+    if which chcon >/dev/null 2>&1; then
+        selinuxenabled >/dev/null 2>&1
+        return $?
+    fi
+    return 1
+}
+
 # fix up the container_rootfs
 container_rootfs_configure()
 {
@@ -312,7 +321,7 @@ EOF
     if [ $container_rootfs != "/" -a -d $dev_path ]; then
         rm -rf $dev_path
         mkdir -p $dev_path
-        if which chcon >/dev/null 2>&1 ; then
+        if can_chcon; then
             # ensure symlinks created in /dev have the right context
             chcon -t device_t $dev_path
         fi
@@ -333,7 +342,7 @@ EOF
     mknod -m 600  $dev_path/initctl p
 
     # set selinux labels same as host
-    if which chcon >/dev/null 2>&1 ; then
+    if can_chcon; then
         for node in null zero random urandom pts shm \
                     tty tty0 tty1 tty2 tty3 tty4 full ;
         do