Merge branch 'development' into packages

Signed-off-by: Christian König <github@yubiuser.dev>

automated install/basic-install.sh

@@ -449,7 +449,7 @@ package_manager_detect() {
         # we cannot install required packages
         printf "  %b No supported package manager found\\n" "${CROSS}"
         # so exit the installer
-        exit
+        exit 1
     fi
 }
 
@@ -2438,15 +2438,6 @@ main() {
         pihole -a -p "${pw}"
     fi
 
-    # write privacy level and logging to pihole.toml
-    # set on fresh installations by setPrivacyLevel() and setLogging(
-    if [ -n "${QUERY_LOGGING}" ]; then
-        pihole-FTL --config dns.queryLogging "${QUERY_LOGGING}"
-    fi
-    if [ -n "${PRIVACY_LEVEL}" ]; then
-        pihole-FTL --config misc.privacylevel "${PRIVACY_LEVEL}"
-    fi
-
     # Migrate existing install to v6.0
     migrate_dnsmasq_configs
 
@@ -2472,6 +2463,16 @@ main() {
 
     restart_service pihole-FTL
 
+    # write privacy level and logging to pihole.toml
+    # needs to be done after FTL service has been started, otherwise pihole.toml does not exist
+    # set on fresh installations by setPrivacyLevel() and setLogging(
+    if [ -n "${QUERY_LOGGING}" ]; then
+        setFTLConfigValue "dns.queryLogging" "${QUERY_LOGGING}"
+    fi
+    if [ -n "${PRIVACY_LEVEL}" ]; then
+        setFTLConfigValue "misc.privacylevel" "${PRIVACY_LEVEL}"
+    fi
+
     # Download and compile the aggregated block list
     runGravity