Merge branch 'master' into dev/texasaggie97/allow-disable-of-each-config

Author: texasaggie97

nilrt_snac/_configs/_console_config.py

@@ -14,13 +14,13 @@ def __init__(self):
     def configure(self, args: argparse.Namespace) -> None:
         print("Deconfiguring console access...")
 
-        if args.dry_run:
-            return
+        if not args.dry_run:
+            logger.debug("Disabling console access...")
+            subprocess.run(
+                ["nirtcfg", "--set", "section=systemsettings,token=consoleout.enabled,value=False"],
+                check=True,
+            )
 
-        subprocess.run(
-            ["nirtcfg", "--set", "section=systemsettings,token=consoleout.enabled,value=False"],
-            check=True,
-        )
         opkg.remove("sysconfig-settings-console", force_depends=True)
 
     def verify(self, args: argparse.Namespace) -> bool:

nilrt_snac/_configs/_graphical_config.py

@@ -8,17 +8,20 @@
 
 
 class _GraphicalConfig(_BaseConfig):
-    """The graphical configuration for SNAC is to deconfigure the X11, embedded UI, and other components that are only useful when using the graphical UI."""
+    """The graphical configuration for SNAC is to deconfigure the X11, embedded UI, and other components that are useful only when using the graphical UI."""
 
     def __init__(self):
         super().__init__("graphical")
 
     def configure(self, args: Namespace) -> None:
         print("Deconfiguring the graphical UI...")
-        if args.dry_run:
-            return
+        if not args.dry_run:
+            logger.debug("Disabling the embedded UI...")
+            run(
+                ["nirtcfg", "--set", "section=systemsettings,token=ui.enabled,value=False"],
+                check=True,
+            )
 
-        run(["nirtcfg", "--set", "section=systemsettings,token=ui.enabled,value=False"], check=True)
         opkg.remove("packagegroup-ni-graphical", autoremove=True)
         opkg.remove("packagegroup-core-x11", autoremove=True)
 

nilrt_snac/_configs/_opkg_config.py

@@ -19,7 +19,6 @@ def configure(self, args: argparse.Namespace) -> None:
         print("Configuring opkg...")
         snac_config_file = _ConfigFile(OPKG_SNAC_CONF)
         snac_config_file.chmod(0o644)
-        base_feeds_config_file = _ConfigFile("/etc/opkg/base-feeds.conf")
         dry_run: bool = args.dry_run
 
         if not snac_config_file.contains_exact("option autoremove 1"):
@@ -37,26 +36,20 @@ def configure(self, args: argparse.Namespace) -> None:
             if not dry_run:
                 subprocess.run(["rm", "-fv", "/etc/opkg/NI-dist.conf"], check=True)
 
-        if base_feeds_config_file.contains("src.*/extra/.*"):
-            base_feeds_config_file.update("^src.*/extra/.*", "")
-
         snac_config_file.save(dry_run)
-        base_feeds_config_file.save(dry_run)
         self._opkg_helper.update()
 
     def verify(self, args: argparse.Namespace) -> bool:
         print("Verifying opkg configuration...")
         snac_config_file = _ConfigFile(OPKG_SNAC_CONF)
-        base_feeds_config_file = _ConfigFile("/etc/opkg/base-feeds.conf")
         valid = True
         if not snac_config_file.exists():
             valid = False
             logger.error(f"MISSING: {OPKG_SNAC_CONF} not found")
         elif not snac_config_file.contains_exact("option autoremove 1"):
             valid = False
             logger.error(f"MISSING: 'option autoremove 1' not found in {snac_config_file.path}")
-        if base_feeds_config_file.contains("src.*/extra/.*"):
+        if pathlib.Path("/etc/opkg/NI-dist.conf").exists():
             valid = False
-            logger.error(f"FOUND: 'src.*/extra/.*' found in {base_feeds_config_file.path}")
-
+            logger.error("UNSUPPORTED: /etc/opkg/NI-dist.conf found")
         return valid

nilrt_snac/_configs/_syslog_ng_config.py

@@ -15,18 +15,23 @@ def __init__(self):
     def configure(self, args: argparse.Namespace) -> None:
         print("Configuring syslog-ng...")
         dry_run: bool = args.dry_run
-        if dry_run:
-            return
 
         # Check if syslog-ng is already installed
         if not self._opkg_helper.is_installed("syslog-ng"):
             self._opkg_helper.install("syslog-ng")
 
-        # Enable persistent storage
-        _cmd("nirtcfg", "--set", 'section=SystemSettings,token=PersistentLogs.enabled,value="True"')
-
-        # Restart syslog-ng service
-        _cmd("/etc/init.d/syslog", "restart")
+        if not dry_run:
+            # Enable persistent storage
+            logger.debug("Enabling persistent log storage...")
+            _cmd(
+                "nirtcfg",
+                "--set",
+                'section=SystemSettings,token=PersistentLogs.enabled,value="True"',
+            )
+
+            # Restart syslog-ng service
+            logger.debug("Restarting syslog-ng service...")
+            _cmd("/etc/init.d/syslog", "restart")
 
     def verify(self, args: argparse.Namespace) -> bool:
         print("Verifying syslog-ng configuration...")

nilrt_snac/_configs/_wifi_config.py

@@ -13,7 +13,7 @@ def __init__(self):
         super().__init__("wifi")
 
     def configure(self, args: argparse.Namespace) -> None:
-        print("Configuring WiFi configuration...")
+        print("Disabling WiFi support...")
         config_file = _ConfigFile("/etc/modprobe.d/snac_blacklist.conf")
         dry_run: bool = args.dry_run
         if not config_file.contains_exact("install cfg80211 /bin/true"):
@@ -37,13 +37,17 @@ def configure(self, args: argparse.Namespace) -> None:
             subprocess.run(["rmmod", "cfg80211", "mac80211"], check=False)
 
     def verify(self, args: argparse.Namespace) -> bool:
-        print("Verifying WiFi configuration...")
+        print("Verifying WiFi support disabled...")
         config_file = _ConfigFile("/etc/modprobe.d/snac_blacklist.conf")
         valid = True
         if not config_file.exists():
             valid = False
             logger.error(f"MISSING: {config_file.path} not found")
-        elif not config_file.contains_exact("install cfg80211 /bin/true"):
+        if not config_file.contains_exact("install cfg80211 /bin/true"):
             valid = False
-            logger.error("MISSING: commands to fail install of WiFi modules")
+            logger.error(
+                "MISSING: The line 'install cfg80211 /bin/true' was not found in "
+                f"{config_file.path}. This command is required to prevent WiFi kernel modules from loading. "
+                "Please ensure the file contains the necessary 'install' directives to fully disable WiFi support."
+            )
         return valid