From 417563737634aa24ec38fd02f45a8906525f4c88 Mon Sep 17 00:00:00 2001
From: thislight <l1589002388@gmail.com>
Date: Sat, 13 Jul 2024 22:14:39 +0800
Subject: [PATCH] fedora-40: fix storage.conf not found

---
 fedora-40/Containerfile           | 11 +----------
 fedora-40/containers/storage.conf |  2 ++
 2 files changed, 3 insertions(+), 10 deletions(-)
 create mode 100644 fedora-40/containers/storage.conf

diff --git a/fedora-40/Containerfile b/fedora-40/Containerfile
index a6ee3c8..1fe50bf 100644
--- a/fedora-40/Containerfile
+++ b/fedora-40/Containerfile
@@ -21,6 +21,7 @@ RUN dnf update -y --setopt install_weak_deps=False && \
     dnf clean all -y
 
 ADD containers.conf /etc/containers/
+ADD containers/storage.conf /etc/containers/
 
 # Adjust storage.conf to enable Fuse storage.
 RUN sed -i -e 's|^#mount_program|mount_program|g' -e '/additionalimage.*/a "/var/lib/shared",' /etc/containers/storage.conf
@@ -33,16 +34,6 @@ RUN useradd action && \
     mkdir -p /home/action/.local/share/containers && \
     mkdir -p /home/action/.config/containers && \
     chown -R action:action /home/action
-# See:  https://github.com/containers/buildah/issues/4669
-# Copy & modify the config for the `build` user and remove the global
-# `runroot` and `graphroot` which current `build` user cannot access,
-# in such case storage will choose a runroot in `/var/tmp`.
-RUN sed -e 's|^#mount_program|mount_program|g' \
-        -e 's|^graphroot|#graphroot|g' \
-        -e 's|^runroot|#runroot|g' \
-        /etc/containers/storage.conf \
-        > /home/build/.config/containers/storage.conf && \
-        chown build:build /home/build/.config/containers/storage.conf
 
 VOLUME /var/lib/containers
 VOLUME /home/action/.local/share/containers
diff --git a/fedora-40/containers/storage.conf b/fedora-40/containers/storage.conf
new file mode 100644
index 0000000..21e9fb5
--- /dev/null
+++ b/fedora-40/containers/storage.conf
@@ -0,0 +1,2 @@
+[storage.option.overlay]
+mount_program="/usr/bin/fuse-overlayfs"