Refuse to install on buster, part 2.

.gitignore

@@ -2,7 +2,7 @@
 build/
 
 #VS Code config files.
-.vscode/
+# .vscode/  Sort this out later. .gitignore-ing an already tracked file doesn't actually work.
 #settings
 
 Testing/

.vscode/launch.json

@@ -10,6 +10,13 @@
     // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
     "version": "0.2.0",
     "configurations": [
+    {
+        "name": "Attach to Edge",
+        "port": 9222,
+        "request": "attach",
+        "type": "msedge",
+        "webRoot": "${workspaceFolder}"
+    },
     {
         "name": "(gdb) Attach",
         "type": "cppdbg",
@@ -308,8 +315,11 @@
             // Resolved by CMake Tools:
             "program": "${command:cmake.launchTargetPath}",
             "args": [ 
+                "--prefix",
+                "/usr/sbin",
                 "--nosudo", // run without sudo (which will fail because of perms, but allow us to debug deeper into install code.)
-                "--disable-p2p"
+                "--install"
+
                 //"--get-current-port"
                 //"--install"
                 //"--enable-p2p" , "CA", "PiPedalTest","12345678","14"

src/SetWifiConfig.cpp

@@ -70,8 +70,39 @@ const std::string &pipedal::GetWifiConfigWlanAddress()
     return gWlanAddress;
 }
 
+static bool gNetworkManagerTestExecuted = false;
+static bool gUsingNetworkManager = false;
+
+void pipedal::PretendNetworkManagerIsInstalled()
+{
+    gNetworkManagerTestExecuted = true;
+    gUsingNetworkManager = true;
+}
 bool pipedal::UsingNetworkManager()
 {
+    if (gNetworkManagerTestExecuted)
+    {
+        return gUsingNetworkManager;
+    }
+    bool bResult = false;
+    auto result = sysExecForOutput("systemctl","is-active NetworkManager");
+    if (result.exitCode == EXIT_SUCCESS)
+    {
+        std::string text = result.output.erase(result.output.find_last_not_of(" \n\r\t")+1);
+        if (text == "active")
+        {
+            bResult = true;
+        } else if (text == "inactive")
+        {
+            bResult = false;
+        } else {
+            throw std::runtime_error(SS("UsingNetworkManager: unexpected result (" << text << ")"));
+        }
+        gNetworkManagerTestExecuted = true;
+        gUsingNetworkManager = bResult;
+        return bResult;
+    }
+
     // does the neworkManager service path exists?
     return std::filesystem::exists(NETWORK_MANAGER_SERVICE_PATH);
 }

src/SetWifiConfig.hpp

@@ -36,4 +36,6 @@ namespace pipedal {
     void OnWifiInstallComplete();
 
     bool UsingNetworkManager();
+    void PretendNetworkManagerIsInstalled();
+
 } // namespace.