Просмотр исходного кода

Disable apparmor check for debian and change log routine for status check.

Raphael Schneeberger 7 лет назад
Родитель
Сommit
a521c3cef9
2 измененных файлов с 1 добавлено и 12 удалено
  1. 0 11
      install/hst-install-debian.sh
  2. 1 1
      install/hst-install-ubuntu.sh

+ 0 - 11
install/hst-install-debian.sh

@@ -753,17 +753,6 @@ if [ "$phpfpm" = 'yes' ]; then
     software=$(echo "$software" | sed -e 's/php-mysql//')
     software=$(echo "$software" | sed -e 's/php-mysql//')
 fi
 fi
 
 
-#----------------------------------------------------------#
-                  Disable Apparmor on LCX                  #
-#----------------------------------------------------------#
-
-if grep --quiet lxc /proc/1/environ; then
-    if [ -f /etc/init.d/apparmor ]; then
-        systemctl stop apparmor > /dev/null 2>&1
-        systemctl disable apparmor > /dev/null 2>&1
-    fi
-fi
-
 
 
 #----------------------------------------------------------#
 #----------------------------------------------------------#
 #                     Install packages                     #
 #                     Install packages                     #

+ 1 - 1
install/hst-install-ubuntu.sh

@@ -1222,7 +1222,7 @@ if [ "$named" = 'yes' ]; then
     chmod 640 /etc/bind/named.conf.options
     chmod 640 /etc/bind/named.conf.options
     aa-complain /usr/sbin/named > /dev/null 2>&1
     aa-complain /usr/sbin/named > /dev/null 2>&1
     echo "/home/** rwm," >> /etc/apparmor.d/local/usr.sbin.named > /dev/null 2>&1
     echo "/home/** rwm," >> /etc/apparmor.d/local/usr.sbin.named > /dev/null 2>&1
-    service apparmor status >> $LOG
+    service apparmor status > /dev/null 2>&1
     if [ $? -ne 0 ]; then
     if [ $? -ne 0 ]; then
         service apparmor restart
         service apparmor restart
     fi
     fi