50dc83
From 421743b7cfa6a249544f6abb4cca5a612bd20ea1 Mon Sep 17 00:00:00 2001
50dc83
From: Atin Mukherjee <amukherj@redhat.com>
50dc83
Date: Tue, 11 Dec 2018 16:21:43 +0530
50dc83
Subject: [PATCH 23/52] hooks: remove selinux hooks
50dc83
50dc83
Label: DOWNSTREAM ONLY
50dc83
50dc83
Change-Id: I810466a0ca99ab21f5a8eac8cdffbb18333d10ad
50dc83
Signed-off-by: Atin Mukherjee <amukherj@redhat.com>
50dc83
Reviewed-on: https://code.engineering.redhat.com/gerrit/135800
50dc83
Tested-by: RHGS Build Bot <nigelb@redhat.com>
50dc83
Reviewed-by: Jiffin Thottan <jthottan@redhat.com>
50dc83
Reviewed-by: Milind Changire <mchangir@redhat.com>
50dc83
---
50dc83
 configure.ac                                | 20 --------------------
50dc83
 extras/hook-scripts/Makefile.am             |  2 +-
50dc83
 extras/hook-scripts/create/Makefile.am      |  1 -
50dc83
 extras/hook-scripts/create/post/Makefile.am |  8 --------
50dc83
 extras/hook-scripts/delete/Makefile.am      |  1 -
50dc83
 extras/hook-scripts/delete/pre/Makefile.am  |  8 --------
50dc83
 glusterfs.spec.in                           |  2 --
50dc83
 7 files changed, 1 insertion(+), 41 deletions(-)
50dc83
 delete mode 100644 extras/hook-scripts/create/Makefile.am
50dc83
 delete mode 100644 extras/hook-scripts/create/post/Makefile.am
50dc83
 delete mode 100644 extras/hook-scripts/delete/Makefile.am
50dc83
 delete mode 100644 extras/hook-scripts/delete/pre/Makefile.am
50dc83
50dc83
diff --git a/configure.ac b/configure.ac
50dc83
index 2f341de..0d06f5a 100644
50dc83
--- a/configure.ac
50dc83
+++ b/configure.ac
50dc83
@@ -214,10 +214,6 @@ AC_CONFIG_FILES([Makefile
50dc83
                 extras/hook-scripts/add-brick/Makefile
50dc83
                 extras/hook-scripts/add-brick/pre/Makefile
50dc83
                 extras/hook-scripts/add-brick/post/Makefile
50dc83
-                extras/hook-scripts/create/Makefile
50dc83
-                extras/hook-scripts/create/post/Makefile
50dc83
-                extras/hook-scripts/delete/Makefile
50dc83
-                extras/hook-scripts/delete/pre/Makefile
50dc83
                 extras/hook-scripts/start/Makefile
50dc83
                 extras/hook-scripts/start/post/Makefile
50dc83
                 extras/hook-scripts/set/Makefile
50dc83
@@ -909,21 +905,6 @@ fi
50dc83
 AM_CONDITIONAL([BUILD_CLOUDSYNC], [test "x$BUILD_CLOUDSYNC" = "xyes"])
50dc83
 dnl end cloudsync section
50dc83
 
50dc83
-dnl SELinux feature enablement
50dc83
-case $host_os in
50dc83
-  linux*)
50dc83
-    AC_ARG_ENABLE([selinux],
50dc83
-                  AC_HELP_STRING([--disable-selinux],
50dc83
-                                 [Disable SELinux features]),
50dc83
-                  [USE_SELINUX="${enableval}"], [USE_SELINUX="yes"])
50dc83
-    ;;
50dc83
-  *)
50dc83
-    USE_SELINUX=no
50dc83
-    ;;
50dc83
-esac
50dc83
-AM_CONDITIONAL(USE_SELINUX, test "x${USE_SELINUX}" = "xyes")
50dc83
-dnl end of SELinux feature enablement
50dc83
-
50dc83
 AC_CHECK_HEADERS([execinfo.h], [have_backtrace=yes])
50dc83
 if test "x${have_backtrace}" = "xyes"; then
50dc83
    AC_DEFINE(HAVE_BACKTRACE, 1, [define if found backtrace])
50dc83
@@ -1599,7 +1580,6 @@ echo "XML output           : $BUILD_XML_OUTPUT"
50dc83
 echo "Unit Tests           : $BUILD_UNITTEST"
50dc83
 echo "Track priv ports     : $TRACK_PRIVPORTS"
50dc83
 echo "POSIX ACLs           : $BUILD_POSIX_ACLS"
50dc83
-echo "SELinux features     : $USE_SELINUX"
50dc83
 echo "firewalld-config     : $BUILD_FIREWALLD"
50dc83
 echo "Events               : $BUILD_EVENTS"
50dc83
 echo "EC dynamic support   : $EC_DYNAMIC_SUPPORT"
50dc83
diff --git a/extras/hook-scripts/Makefile.am b/extras/hook-scripts/Makefile.am
50dc83
index 26059d7..771b37e 100644
50dc83
--- a/extras/hook-scripts/Makefile.am
50dc83
+++ b/extras/hook-scripts/Makefile.am
50dc83
@@ -1,5 +1,5 @@
50dc83
 EXTRA_DIST = S40ufo-stop.py S56glusterd-geo-rep-create-post.sh
50dc83
-SUBDIRS = add-brick create delete set start stop reset
50dc83
+SUBDIRS = add-brick set start stop reset
50dc83
 
50dc83
 scriptsdir = $(GLUSTERD_WORKDIR)/hooks/1/gsync-create/post/
50dc83
 if USE_GEOREP
50dc83
diff --git a/extras/hook-scripts/create/Makefile.am b/extras/hook-scripts/create/Makefile.am
50dc83
deleted file mode 100644
50dc83
index b083a91..0000000
50dc83
--- a/extras/hook-scripts/create/Makefile.am
50dc83
+++ /dev/null
50dc83
@@ -1 +0,0 @@
50dc83
-SUBDIRS = post
50dc83
diff --git a/extras/hook-scripts/create/post/Makefile.am b/extras/hook-scripts/create/post/Makefile.am
50dc83
deleted file mode 100644
50dc83
index fd1892e..0000000
50dc83
--- a/extras/hook-scripts/create/post/Makefile.am
50dc83
+++ /dev/null
50dc83
@@ -1,8 +0,0 @@
50dc83
-EXTRA_DIST = S10selinux-label-brick.sh
50dc83
-
50dc83
-scriptsdir = $(GLUSTERD_WORKDIR)/hooks/1/create/post/
50dc83
-if WITH_SERVER
50dc83
-if USE_SELINUX
50dc83
-scripts_SCRIPTS = S10selinux-label-brick.sh
50dc83
-endif
50dc83
-endif
50dc83
diff --git a/extras/hook-scripts/delete/Makefile.am b/extras/hook-scripts/delete/Makefile.am
50dc83
deleted file mode 100644
50dc83
index c98a05d..0000000
50dc83
--- a/extras/hook-scripts/delete/Makefile.am
50dc83
+++ /dev/null
50dc83
@@ -1 +0,0 @@
50dc83
-SUBDIRS = pre
50dc83
diff --git a/extras/hook-scripts/delete/pre/Makefile.am b/extras/hook-scripts/delete/pre/Makefile.am
50dc83
deleted file mode 100644
50dc83
index 4fbfbe7..0000000
50dc83
--- a/extras/hook-scripts/delete/pre/Makefile.am
50dc83
+++ /dev/null
50dc83
@@ -1,8 +0,0 @@
50dc83
-EXTRA_DIST = S10selinux-del-fcontext.sh
50dc83
-
50dc83
-scriptsdir = $(GLUSTERD_WORKDIR)/hooks/1/delete/pre/
50dc83
-if WITH_SERVER
50dc83
-if USE_SELINUX
50dc83
-scripts_SCRIPTS = S10selinux-del-fcontext.sh
50dc83
-endif
50dc83
-endif
50dc83
diff --git a/glusterfs.spec.in b/glusterfs.spec.in
50dc83
index ec06176..db50b8e 100644
50dc83
--- a/glusterfs.spec.in
50dc83
+++ b/glusterfs.spec.in
50dc83
@@ -1413,7 +1413,6 @@ exit 0
50dc83
             %attr(0755,-,-) %{_sharedstatedir}/glusterd/hooks/1/add-brick/pre/S28Quota-enable-root-xattr-heal.sh
50dc83
        %dir %attr(0755,-,-) %{_sharedstatedir}/glusterd/hooks/1/create
50dc83
        %dir %attr(0755,-,-) %{_sharedstatedir}/glusterd/hooks/1/create/post
50dc83
-            %attr(0755,-,-) %{_sharedstatedir}/glusterd/hooks/1/create/post/S10selinux-label-brick.sh
50dc83
 %ghost %dir %attr(0755,-,-) %{_sharedstatedir}/glusterd/hooks/1/create/pre
50dc83
 %ghost %dir %attr(0755,-,-) %{_sharedstatedir}/glusterd/hooks/1/copy-file
50dc83
 %ghost %dir %attr(0755,-,-) %{_sharedstatedir}/glusterd/hooks/1/copy-file/post
50dc83
@@ -1422,7 +1421,6 @@ exit 0
50dc83
        %dir %attr(0755,-,-) %{_sharedstatedir}/glusterd/hooks/1/delete/post
50dc83
                             %{_sharedstatedir}/glusterd/hooks/1/delete/post/S57glusterfind-delete-post
50dc83
        %dir %attr(0755,-,-) %{_sharedstatedir}/glusterd/hooks/1/delete/pre
50dc83
-            %attr(0755,-,-) %{_sharedstatedir}/glusterd/hooks/1/delete/pre/S10selinux-del-fcontext.sh
50dc83
 %ghost %dir %attr(0755,-,-) %{_sharedstatedir}/glusterd/hooks/1/remove-brick
50dc83
 %ghost %dir %attr(0755,-,-) %{_sharedstatedir}/glusterd/hooks/1/remove-brick/post
50dc83
 %ghost %dir %attr(0755,-,-) %{_sharedstatedir}/glusterd/hooks/1/remove-brick/pre
50dc83
-- 
50dc83
1.8.3.1
50dc83