Merge 171bdb9e66 into fe2348a725

added support for aa-complian.

lnxrouter

@@ -2116,8 +2116,9 @@ run_wifi_ap_processes() {
     echo 
     echo "Starting hostapd"
     
-    if which complain > /dev/null 2>&1; then
+    if COMPLAIN_CMD="$(command -v aa-complain || command -v complain)"; then
-        complain hostapd
+        echo "Setting hostapd to AppArmor complain mode..."
+        "$COMPLAIN_CMD" hostapd
     fi
     
     # hostapd '-P' works only when use '-B' (run in background)
@@ -2137,10 +2138,9 @@ start_dnsmasq() {
     echo 
     echo "Starting dnsmasq"
     
-    if which complain > /dev/null 2>&1; then
+    if COMPLAIN_CMD="$(command -v aa-complain || command -v complain)"; then
-        # openSUSE's apparmor does not allow dnsmasq to read files.
+        echo "Setting dnsmasq to AppArmor complain mode..."
-        # remove restriction.
+        "$COMPLAIN_CMD" dnsmasq
-        complain dnsmasq
     fi
     
     # Using '-d'(no daemon) dnsmasq will not turn into 'nobody'