[linux] fix packages to work with podman/docker properly.

also don't run container test if the podman/docker were not found.

Signed-off-by: Vitalii Koshura <[email protected]>

Author: AenBleidd

.github/workflows/linux-package.yml

@@ -1,6 +1,6 @@
 # This file is part of BOINC.
-# http://boinc.berkeley.edu
-# Copyright (C) 2024 University of California
+# https://boinc.berkeley.edu
+# Copyright (C) 2025 University of California
 #
 # BOINC is free software; you can redistribute it and/or modify it
 # under the terms of the GNU Lesser General Public License
@@ -396,12 +396,18 @@ jobs:
               fi
                 done
             }
+            if [ -x /bin/systemctl ] ; then
+              if systemctl is-active --quiet boinc-client.service; then
+                systemctl stop boinc-client.service
+              fi
+            fi
             if ! getent group ${BOINCGROUP} >/dev/null; then
               groupadd -r ${BOINCGROUP}
             fi
             if ! getent passwd ${BOINCUSER} >/dev/null; then
               useradd -r -g ${BOINCGROUP} -d ${BOINCDIR} -s /usr/sbin/nologin -c \"BOINC user\" ${BOINCUSER}
             fi
+            usermod -d ${BOINCDIR} ${BOINCUSER}
             if ! getent group ${BOINCGROUP} | grep -q ${BOINCUSER}; then
               usermod -a -G ${BOINCGROUP} ${BOINCUSER}
             fi
@@ -425,6 +431,7 @@ jobs:
                     usermod -a -G ${BOINCGROUP} \"\$SUDO_USER\"
                 fi
             fi
+            usermod --add-subuids 100000-165535 --add-subgids 100000-165535 ${BOINCUSER}
             if [ ! -d /etc/boinc-client ] ; then
               mkdir -p /etc/boinc-client
             fi

client/hostinfo_unix.cpp

@@ -1,6 +1,6 @@
 // This file is part of BOINC.
 // https://boinc.berkeley.edu
-// Copyright (C) 2024 University of California
+// Copyright (C) 2025 University of California
 //
 // BOINC is free software; you can redistribute it and/or modify it
 // under the terms of the GNU Lesser General Public License
@@ -1268,24 +1268,26 @@ bool HOST_INFO::get_docker_version_aux(DOCKER_TYPE type){
     //
     // Since we do this every time on startup, don't delete the image.
     //
-    cmd = string(docker_cli_prog(type)) + " run hello-world 2>/dev/null";
-    bool found = false;
-    f = popen(cmd.c_str(), "r");
-    if (f) {
-        while (fgets(buf, 256, f)) {
-            if (strstr(buf, "Hello")) {
-                found = true;
-                break;
+    if (ret) {
+        cmd = string(docker_cli_prog(type)) + " run hello-world 2>/dev/null";
+        bool found = false;
+        f = popen(cmd.c_str(), "r");
+        if (f) {
+            while (fgets(buf, 256, f)) {
+                if (strstr(buf, "Hello")) {
+                    found = true;
+                    break;
+                }
             }
+            pclose(f);
+        }
+        if (!found) {
+            msg_printf(NULL, MSG_INFO,
+                "%s found but 'hello-world' test failed",
+                docker_type_str(type)
+            );
+            docker_version[0] = 0;
         }
-        pclose(f);
-    }
-    if (!found) {
-        msg_printf(NULL, MSG_INFO,
-            "%s found but 'hello-world' test failed",
-            docker_type_str(type)
-        );
-        docker_version[0] = 0;
     }
 #endif
     return ret;

client/scripts/boinc-client.service.in

@@ -9,7 +9,7 @@ Type=simple
 ProtectHome=true
 ProtectSystem=strict
 ProtectControlGroups=true
-ReadWritePaths=-/var/lib/boinc -/etc/boinc-client -/tmp
+ReadWritePaths=-/var/lib/boinc -/etc/boinc-client -/tmp -/var/tmp
 Nice=10
 User=boinc
 WorkingDirectory=/var/lib/boinc

packages/deb/postinst

@@ -2,7 +2,7 @@
 
 # This file is part of BOINC.
 # https://boinc.berkeley.edu
-# Copyright (C) 2024 University of California
+# Copyright (C) 2025 University of California
 #
 # BOINC is free software; you can redistribute it and/or modify it
 # under the terms of the GNU Lesser General Public License
@@ -52,13 +52,20 @@ update_nested_dirs() {
     done
 }
 
+if [ -x /bin/systemctl ] ; then
+    if systemctl is-active --quiet boinc-client.service; then
+        systemctl stop boinc-client.service
+    fi
+fi
+
 if ! getent group ${BOINCGROUP} >/dev/null; then
     groupadd -r ${BOINCGROUP}
 fi
 
 if ! getent passwd ${BOINCUSER} >/dev/null; then
     useradd -r -g ${BOINCGROUP} -d ${BOINCDIR} -s /usr/sbin/nologin -c "BOINC user" ${BOINCUSER}
 fi
+usermod -d "$BOINCDIR" "$BOINCUSER"
 
 if ! getent group ${BOINCGROUP} | grep -q ${BOINCUSER}; then
     usermod -a -G ${BOINCGROUP} ${BOINCUSER}
@@ -88,6 +95,8 @@ if [ -n "$SUDO_USER" ]; then
     fi
 fi
 
+usermod --add-subuids 100000-165535 --add-subgids 100000-165535 ${BOINCUSER}
+
 if [ ! -d /etc/boinc-client ] ; then
     mkdir -p /etc/boinc-client
 fi

tests/linux_package_integration_tests.py

@@ -1,6 +1,6 @@
 # This file is part of BOINC.
 # https://boinc.berkeley.edu
-# Copyright (C) 2024 University of California
+# Copyright (C) 2025 University of California
 #
 # BOINC is free software; you can redistribute it and/or modify it
 # under the terms of the GNU Lesser General Public License
@@ -50,6 +50,31 @@ def _get_group_exists(self, groupname):
     def _get_user_in_group(self, username, groupname):
         return os.popen("id -Gn {username}".format(username=username)).read().strip().find(groupname) != -1
 
+    def _get_user_home_directory(self, username):
+        return os.popen("getent passwd {username}".format(username=username)).read().strip().split(":")[5]
+
+    def _get_uid_range(self, username):
+        result = os.popen("cat /etc/subuid | grep {username}".format(username=username)).read().strip()
+        if (result == ""):
+            return ""
+        result = result.split(":")
+        if (len(result) != 3):
+            return ""
+        start = int(result[1])
+        count = int(result[2])
+        return "{start}:{count}".format(start=start, count=count)
+
+    def _get_gid_range(self, groupname):
+        result = os.popen("cat /etc/subgid | grep {groupname}".format(groupname=groupname)).read().strip()
+        if (result == ""):
+            return ""
+        result = result.split(":")
+        if (len(result) != 3):
+            return ""
+        start = int(result[1])
+        count = int(result[2])
+        return "{start}:{count}".format(start=start, count=count)
+
     def _get_key_value_pairs_from_file(self, filename):
         result = {}
         with open(filename, "r") as f:
@@ -143,13 +168,16 @@ def test_user(self):
             ts.expect_true(self._get_user_in_group("boinc", "video"), "Test 'boinc' user is in 'video' group")
         if (self._get_group_exists("render")):
             ts.expect_true(self._get_user_in_group("boinc", "render"), "Test 'boinc' user is in 'render' group")
+        ts.expect_equal("/var/lib/boinc", self._get_user_home_directory("boinc"), "Test 'boinc' user home directory is '/var/lib/boinc'")
+        ts.expect_equal("100000:65536", self._get_uid_range("boinc"), "Test 'boinc' user UID range is '100000:65536'")
+        ts.expect_equal("100000:65536", self._get_gid_range("boinc"), "Test 'boinc' group GID range is '100000:65536'")
         return ts.result()
 
     def test_selected_values_from_boinc_client_service_file(self):
         ts = testset.TestSet("Test selected values from the '/usr/lib/systemd/system/boinc-client.service' file")
         data = self._get_key_value_pairs_from_file("/usr/lib/systemd/system/boinc-client.service")
         ts.expect_equal(data["ProtectSystem"], "strict", "Test 'ProtectSystem' is correctly set")
-        ts.expect_equal(data["ReadWritePaths"], "-/var/lib/boinc -/etc/boinc-client -/tmp", "Test 'ReadWritePaths' is correctly set")
+        ts.expect_equal(data["ReadWritePaths"], "-/var/lib/boinc -/etc/boinc-client -/tmp -/var/tmp", "Test 'ReadWritePaths' is correctly set")
         ts.expect_equal(data["User"], "boinc", "Test 'User' is correctly set")
         ts.expect_equal(data["WorkingDirectory"], "/var/lib/boinc", "Test 'WorkingDirectory' is correctly set")
         ts.expect_equal(data["ExecStart"], "/usr/local/bin/boinc", "Test 'ExecStart' is correctly set")