From c6fa6c9b19425770e093a085da697d3c28d974c2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?= Date: Sun, 9 Aug 2015 20:06:59 +0200 Subject: [PATCH] debian: remove SELinux disabling code Debian doesn't have it enabled anyway. Do not prevent the user from tinkering with that. (reported by @adrelanos) Fixes qubesos/qubes-issues#1103 --- debian/qubes-core-agent.postinst | 16 ---------------- debian/qubes-core-agent.triggers | 1 - 2 files changed, 17 deletions(-) diff --git a/debian/qubes-core-agent.postinst b/debian/qubes-core-agent.postinst index 29f57fd..ae96137 100755 --- a/debian/qubes-core-agent.postinst +++ b/debian/qubes-core-agent.postinst @@ -62,15 +62,6 @@ installSerialConf() { fi } -disableSELinux() { - debug "Disabling SELinux..." - if [ -e /etc/selinux/config ]; then - sed -e s/^SELINUX=.*$/SELINUX=disabled/ /etc/selinux/config.processed - mv /etc/selinux/config.processed /etc/selinux/config - setenforce 0 2>/dev/null - fi -} - case "${1}" in configure) # Initial installation of package only @@ -119,9 +110,6 @@ case "${1}" in # Maybe install overridden serial.conf init script installSerialConf - - # Maybe disable SELinux - disableSELinux fi debug "UPDATE..." @@ -187,10 +175,6 @@ case "${1}" in installSerialConf ;; - # Disable SELinux" - /etc/selinux/config) - disableSELinux - ;; esac done exit 0 diff --git a/debian/qubes-core-agent.triggers b/debian/qubes-core-agent.triggers index 817775b..a970467 100644 --- a/debian/qubes-core-agent.triggers +++ b/debian/qubes-core-agent.triggers @@ -1,4 +1,3 @@ interest-noawait /usr/share/applications interest-noawait /etc/xdg interest-noawait /etc/init/serial.conf -interest-noawait /etc/selinux/config