From f4e8a921a6138c2c6d60ed6c51fdca865b6a8c8e Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Fri, 21 Jul 2023 09:05:14 -0700 Subject: [PATCH] koji_builder: add /dev/fuse mount to runroots ostree unified composes need /dev/fuse, so allow/add it to runroot defaults. See https://pagure.io/fedora-infrastructure/issue/11420 Signed-off-by: Kevin Fenzi --- roles/koji_builder/templates/runroot.conf.j2 | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/roles/koji_builder/templates/runroot.conf.j2 b/roles/koji_builder/templates/runroot.conf.j2 index ffb21a0401..c5defcd7d9 100644 --- a/roles/koji_builder/templates/runroot.conf.j2 +++ b/roles/koji_builder/templates/runroot.conf.j2 @@ -5,7 +5,7 @@ ; parameter for individual calls. ; default_mounts = /mnt/archive,/mnt/workdir {% if env == 'production' %} -default_mounts = /mnt/koji +default_mounts = /mnt/koji,/dev/fuse {% elif env == 'staging' %} ; In staging we also need the production split volume default_mounts = /mnt/koji,/mnt/fedora_koji_prod/koji,/etc/kojid/secrets @@ -15,7 +15,7 @@ default_mounts = /mnt/koji,/mnt/fedora_koji_prod/koji,/etc/kojid/secrets ; Each extra_mount needs to start with some of these prefixes. Other paths are ; not allowed for mounting. Only absolute paths are allowed here, no ; wildcards. -safe_roots = /mnt/koji/compose,/mnt/koji/atomic-cd,/srv/odcs/ +safe_roots = /mnt/koji/compose,/mnt/koji/atomic-cd,/srv/odcs/,/dev/fuse ; path substitutions is tuple per line, delimited by comma, order is ; important. @@ -48,6 +48,12 @@ path = /srv/odcs fstype = bind options = bind +[path5] +mountpoint = /dev/fuse +path = /dev/fuse +fstype = bind +options = bind + {% if env == 'staging' %} ; we need to mount the production split volume here. [path3]