Skip to content

Commit a521c3c

Browse files
committed
Disable apparmor check for debian and change log routine for status check.
1 parent b895abd commit a521c3c

File tree

2 files changed

+1
-12
lines changed

2 files changed

+1
-12
lines changed

install/hst-install-debian.sh

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -753,17 +753,6 @@ if [ "$phpfpm" = 'yes' ]; then
753753
software=$(echo "$software" | sed -e 's/php-mysql//')
754754
fi
755755

756-
#----------------------------------------------------------#
757-
Disable Apparmor on LCX #
758-
#----------------------------------------------------------#
759-
760-
if grep --quiet lxc /proc/1/environ; then
761-
if [ -f /etc/init.d/apparmor ]; then
762-
systemctl stop apparmor > /dev/null 2>&1
763-
systemctl disable apparmor > /dev/null 2>&1
764-
fi
765-
fi
766-
767756

768757
#----------------------------------------------------------#
769758
# Install packages #

install/hst-install-ubuntu.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1222,7 +1222,7 @@ if [ "$named" = 'yes' ]; then
12221222
chmod 640 /etc/bind/named.conf.options
12231223
aa-complain /usr/sbin/named > /dev/null 2>&1
12241224
echo "/home/** rwm," >> /etc/apparmor.d/local/usr.sbin.named > /dev/null 2>&1
1225-
service apparmor status >> $LOG
1225+
service apparmor status > /dev/null 2>&1
12261226
if [ $? -ne 0 ]; then
12271227
service apparmor restart
12281228
fi

0 commit comments

Comments
 (0)