diff options
Diffstat (limited to 'dev-db/scylla/files/0002-detect-gentoo-linux-on-selinux-setup.patch')
| -rw-r--r-- | dev-db/scylla/files/0002-detect-gentoo-linux-on-selinux-setup.patch | 23 |
1 files changed, 11 insertions, 12 deletions
diff --git a/dev-db/scylla/files/0002-detect-gentoo-linux-on-selinux-setup.patch b/dev-db/scylla/files/0002-detect-gentoo-linux-on-selinux-setup.patch index 7b04ed7..756673e 100644 --- a/dev-db/scylla/files/0002-detect-gentoo-linux-on-selinux-setup.patch +++ b/dev-db/scylla/files/0002-detect-gentoo-linux-on-selinux-setup.patch @@ -1,29 +1,28 @@ -From 047e1dcd5b2620b05d8c2a2dc93a6edea9e47ff1 Mon Sep 17 00:00:00 2001 -From: Ultrabug <ultrabug@gentoo.org> -Date: Wed, 3 May 2017 17:19:25 +0200 -Subject: [PATCH 02/13] detect gentoo linux on selinux setup +From bc63e501db716495bd7f4b30fbf4b7fba962ad6b Mon Sep 17 00:00:00 2001 +From: Alexys Jacob <ultrabug@gentoo.org> +Date: Wed, 17 May 2017 18:04:20 +0200 +Subject: [PATCH 2/9] detect gentoo linux on selinux setup +Signed-off-by: Alexys Jacob <ultrabug@gentoo.org> --- - dist/common/scripts/scylla_selinux_setup | 6 +++++- - 1 file changed, 5 insertions(+), 1 deletion(-) + dist/common/scripts/scylla_selinux_setup | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dist/common/scripts/scylla_selinux_setup b/dist/common/scripts/scylla_selinux_setup -index 9d652bfd..234631dc 100755 +index a6ebf5fa..8d8e864c 100755 --- a/dist/common/scripts/scylla_selinux_setup +++ b/dist/common/scripts/scylla_selinux_setup -@@ -4,7 +4,11 @@ +@@ -4,7 +4,9 @@ . /usr/lib/scylla/scylla_lib.sh -if ! is_debian_variant; then -+if is_debian_variant; then -+ echo "scylla_selinux_setup only supports Red Hat variants" -+elif is_gentoo_variant; then ++if is_debian_variant || is_gentoo_variant; then + echo "scylla_selinux_setup only supports Red Hat variants" +else if [ "`sestatus | awk '{print $3}'`" != "disabled" ]; then setenforce 0 - sed -e "s/enforcing/disabled/" /etc/sysconfig/selinux > /tmp/selinux + sed --follow-symlinks -i -e "s/^SELINUX=enforcing/SELINUX=disabled/" /etc/sysconfig/selinux -- 2.12.2 |