Merge pull request #6655 from BOINC/mac_get_podman_path_in_client

Mac: Don't search for podman path in installer or Mac_SA_Secure.sh script

Author: AenBleidd

client/Run_Podman.cpp

@@ -43,9 +43,6 @@ int main(int argc, char *argv[])
     int argsCount = 0;
     int argvCount;
     char buf [2048];
-    char Podman_Path[1024];
-    FILE *f;
-    struct stat sbuf;
     int status = 0;
 
     if (geteuid() != 0) {
@@ -78,65 +75,6 @@ int main(int argc, char *argv[])
     fflush(stdout);
 #endif
 
-    // While the official Podman installer puts the Podman executable at
-    // "/opt/podman/bin/podman", other installation methods (e.g. brew) might not
-
-    // The Mac installer wrote path to podman executable in Path_to_podman.txt
-    Podman_Path[0] = 0;
-    f = fopen("/Library/Application Support/BOINC Data/Path_to_podman.txt", "r");
-    if (f) {
-        fgets(Podman_Path, sizeof(Podman_Path), f);
-        fclose(f);
-        char * p=strstr(Podman_Path, "\n");
-        if (p) *p = '\0'; // Remove the newline character
-    }
-    if (stat((const char*)Podman_Path, &sbuf)!= 0) {
-        Podman_Path[0] = 0;
-    }
-
-    if (Podman_Path[0] == 0) {
-        // If we couldn't get it from that file, use default if installed using Podman installer
-        strlcpy(Podman_Path, "/opt/podman/bin/podman", sizeof(Podman_Path));
-        if (stat((const char*)Podman_Path, &sbuf) != 0) {
-            Podman_Path[0] = 0;
-        }
-    }
-
-    if (Podman_Path[0] == 0) {
-        // If we couldn't get it from that file, use default if installed by Homebrew
-#ifdef __arm64__
-        strlcpy(Podman_Path, "/opt/homebrew/bin/podman", sizeof(Podman_Path));
-#else
-        strlcpy(Podman_Path, "/usr/local/bin/podman", sizeof(Podman_Path));
-#endif
-        if (stat(Podman_Path, &sbuf) != 0) {
-            Podman_Path[0] = 0;
-        }
-    }
-
-    if (Podman_Path[0] == 0) {
-        // Get the path to the podman executable dynamically
-        // Mac executables get a very limited PATH environment variable, so we must get the
-        // PATH variable used by Terminal and search there for the path to podman
-        f = popen("a=`/usr/libexec/path_helper`;b=${a%\\\"*}\\\";env ${b} which podman", "r");
-        if (f) {
-            fgets(Podman_Path, sizeof(Podman_Path), f);
-            pclose(f);
-            char * p=strstr(Podman_Path, "\n");
-            if (p) *p = '\0'; // Remove the newline character
-#if VERBOSE
-            fprintf(debug_file, "popen returned podman path = \"%s\"\n", Podman_Path);
-#endif
-        }
-    }
-    if (Podman_Path[0] == 0) {
-#if VERBOSE
-        fprintf(debug_file, "Can't get path to Podman\n");
-        fflush(debug_file);
-        fclose(debug_file);
-#endif
-        exit(1);
-    }
 
 #if VERBOSE
     dup2(saved_stdout_fd, fileno(stdout));
@@ -149,7 +87,7 @@ int main(int argc, char *argv[])
     // mostly in that user's home directory. To get around this, we
     // simulate a login by user boinc_project and set environment
     // variables for Podman to use our BOINC podman" directory instead
-    snprintf(buf, sizeof(buf), "env XDG_CONFIG_HOME=\"/Library/Application Support/BOINC podman\" XDG_DATA_HOME=\"/Library/Application Support/BOINC podman\" HOME=\"/Library/Application Support/BOINC podman\" %s", Podman_Path);
+    strlcpy(buf, "env XDG_CONFIG_HOME=\"/Library/Application Support/BOINC podman\" XDG_DATA_HOME=\"/Library/Application Support/BOINC podman\" HOME=\"/Library/Application Support/BOINC podman\" ", sizeof(buf));
 
     argvCount = 1;   // arguments to be passed to Podman
     while (argv[argvCount]) {

client/hostinfo_unix.cpp

@@ -1251,6 +1251,9 @@ bool HOST_INFO::is_podman_VM_running() {
 bool HOST_INFO::get_docker_version_aux(DOCKER_TYPE type){
     char cmd[1024], buf[256];
 
+#ifdef __APPLE__
+    if (docker_cli_prog(type)[0] == '\0') return false;
+#endif
     snprintf(cmd, sizeof(cmd), "%s --version 2>/dev/null",
         docker_cli_prog(type)
     );

lib/hostinfo.cpp

@@ -35,6 +35,7 @@
 #include "parse.h"
 #include "util.h"
 #include "str_replace.h"
+#include "filesys.h"
 
 #include "hostinfo.h"
 
@@ -345,13 +346,63 @@ int HOST_INFO::write_cpu_benchmarks(FILE* out) {
     return 0;
 }
 
+#ifdef __APPLE__
+    // While the official Podman installer puts the Podman executable at
+    // "/opt/podman/bin/podman", other installation methods (e.g. brew) might not
+    static void find_podman_path(char *path, size_t len) {
+    // Mac executables get a very limited PATH environment variable, so we must get the
+    // PATH variable used by Terminal and search there for the path to podman
+    FILE *f = popen("a=`/usr/libexec/path_helper`;b=${a%\\\"*}\\\";env ${b} which podman", "r");
+    if (f) {
+        fgets(path, len, f);
+        pclose(f);
+        char* p = strstr(path, "\n");
+        if (p) *p = '\0'; // Remove the newline character
+        }
+        if (boinc_file_exists(path)) return;
+
+        // If we couldn't get it from that file, use default when installed using Podman installer
+        strlcpy(path, "/opt/podman/bin/podman", len);
+        if (boinc_file_exists(path)) return;
+
+        // If we couldn't get it from that file, use default when installed by Homebrew
+#ifdef __arm64__
+        strlcpy(path, "/opt/homebrew/bin/podman", len);
+#else
+        strlcpy(path, "/usr/local/bin/podman", len);
+#endif
+        if (boinc_file_exists(path)) return;
+        path[0] = '\0'; // Failed to find path to Podman
+        return;
+    }
+#endif
+
 // name of CLI program
 //
 const char* docker_cli_prog(DOCKER_TYPE type) {
     switch (type) {
     case DOCKER: return "docker";
 #ifdef __APPLE__
-        case PODMAN: return "\"/Library/Application Support/BOINC Data/Run_Podman\" ";
+        case PODMAN:
+        static char docker_cli_string[MAXPATHLEN];
+        static bool docker_cli_inited = false;
+        char path[MAXPATHLEN];
+        if (docker_cli_inited) return docker_cli_string;
+        docker_cli_string[0] = '\0';
+        find_podman_path(path, sizeof(path));
+        if (path[0]) {
+            strlcpy(docker_cli_string,
+                    "\"/Library/Application Support/BOINC Data/Run_Podman\" ",
+                    sizeof(docker_cli_string)
+                    );
+            strlcat(docker_cli_string,
+                    path,
+                    sizeof(docker_cli_string)
+                    );
+            strlcat(docker_cli_string, " ", sizeof(docker_cli_string));
+        }
+        docker_cli_inited = true;
+        return docker_cli_string;
 #else
     case PODMAN: return "podman";
 #endif

mac_build/Mac_SA_Secure.sh

@@ -74,7 +74,6 @@
 # Updated 8/24/25 to add Run_Podman and BOINC podman directory
 # Updated 8/27/25 to allow podman to stat items under BOINC Data directory
 # Updated 11/9/25 to create "BOINC podman" directory if not present (for bare client)
-# Updated 11/9/25 to create Path_to_podman.txt if not present (for bare client)
 #
 # WARNING: do not use this script with versions of BOINC older
 # than 7.20.4
@@ -232,13 +231,6 @@ dscl . -merge /groups/boinc_master GroupMembership "$(LOGNAME)"
 dscl . -merge /groups/boinc_project GroupMembership "$(LOGNAME)"
 #fi
 
-if [ ! -f "Path_to_podman.txt" ]; then
-    a=`/usr/libexec/path_helper`;b=${a%\"*}\";env ${b} which podman >  /tmp/pathToPodman.txt
-    exec 6</tmp/pathToPodman.txt
-    read pathToPodman <&6
-    printf "%s" "$pathToPodman" > Path_to_podman.txt    # Strips off trailing newline
-fi
-
 # Set permissions of BOINC Data directory's contents:
 #   ss_config.xml is world-readable so screensaver coordinator can read it
 #   all other *.xml are not world-readable to keep authenticators private

mac_installer/PostInstall.cpp

@@ -259,26 +259,6 @@ int main(int argc, char *argv[])
     if (coreClientPID)
         kill(coreClientPID, SIGTERM);   // boinc catches SIGTERM & exits gracefully
 
-    // While the official Podman installer puts the podman executable at
-    // "/opt/podman/bin/podman", other installation methods (e.g. brew) might not.
-    // Mac executables get a very limited PATH environment variable, so we must get the
-    // PATH variable used by Terminal and search ther of the path to podman
-    f = popen("a=`/usr/libexec/path_helper`;b=${a%\\\"*}\\\";env ${b} which podman", "r");
-    s[0] = '\0';
-    if (f) {
-        fgets(s, sizeof(s), f);
-        pclose(f);
-        char * p=strstr(s, "\n");
-        if (p) *p='\0'; // Remove the newline character
-        printf("popen returned podman path = \"%s\"\n", s);
-        // Write path to podman executable to a file for our Run_Podman utility to use
-        f = fopen("/Library/Application Support/BOINC Data/Path_to_podman.txt", "w");
-        if (f) {
-            fprintf(f, "%s", s);
-            fclose(f);
-        }
-    }
-
     // Create the new BOINC Podman directory if it does not yet exist
     snprintf(s, sizeof(s), "/Library/Application Support/" PODMAN_DIR);
     if (stat(s, &sbuf) != 0) {