]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph-build.git/commitdiff
setup_container_runtime.sh: Add tmpfiles config 2441/head
authorZack Cerza <zack@cerza.org>
Wed, 10 Sep 2025 23:11:19 +0000 (17:11 -0600)
committerZack Cerza <zack@cerza.org>
Thu, 11 Sep 2025 15:59:54 +0000 (09:59 -0600)
This should resolve podman failures that mention "current system boot ID differs
from cached boot ID".

Signed-off-by: Zack Cerza <zack@cerza.org>
scripts/setup_container_runtime.sh

index 14087eedd4e91e5823c48153be36dcd6d9a3f323..4b069bac175568d49dc167a7b54cbcc43fa07dbb 100755 (executable)
@@ -26,6 +26,13 @@ function setup_container_runtime () {
   fi
 
   if command -v podman; then
+    if [ "$(podman version -f "{{ lt .Client.Version \"5.6.1\" }}")" = "true" ] && \
+    ! echo "928238bfcdc79a26ceb51d7d9759f99144846c0a  /etc/tmpfiles.d/podman.conf" | sha1sum --status --check -; then
+      # Pull in this fix: https://github.com/containers/podman/pull/26986
+      curl -sS -L -O https://github.com/containers/podman/raw/refs/tags/v5.6.1/contrib/tmpfile/podman.conf
+      sudo mv podman.conf /etc/tmpfiles.d/
+      sudo systemd-tmpfiles --remove
+    fi
     if [ "$(podman version -f "{{ ge .Client.Version \"4\" }}")" = "true" ]; then
       PODMAN_DIR="$HOME/.local/share/containers"
       test -d "$PODMAN_DIR" && command -v restorecon && sudo restorecon -R -T0 -x "$PODMAN_DIR"