[PR PATCH] containers.storage: improve ZFS compatibility

[PR PATCH] containers.storage: improve ZFS compatibility

[CameronNemo]

[-- Attachment #1: Type: text/plain, Size: 1403 bytes --]

There is a new pull request by CameronNemo against master on the void-packages repository

https://github.com/CameronNemo/void-packages containers-storage
https://github.com/void-linux/void-packages/pull/41220

containers.storage: improve ZFS compatibility
Based on feedback from @ahesford

ZFS does not support OverlayFS by default, so the fuse-overlayfs mount
program should be configured to workaround.

<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/41220.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-containers-storage-41220.patch --]
[-- Type: text/x-diff, Size: 1135 bytes --]

From 24d47dbcd597a8033983bc94bf5f04d702591827 Mon Sep 17 00:00:00 2001
From: Cameron Nemo <cam@nohom.org>
Date: Wed, 21 Dec 2022 10:52:32 -0800
Subject: [PATCH] containers.storage: improve ZFS compatibility

ZFS does not support OverlayFS by default, so the fuse-overlayfs mount
program should be configured to workaround.
---
 srcpkgs/containers.storage/template | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/containers.storage/template b/srcpkgs/containers.storage/template
index 6ae5700af4a1..00e20e5c91f7 100644
--- a/srcpkgs/containers.storage/template
+++ b/srcpkgs/containers.storage/template
@@ -1,8 +1,9 @@
 # Template file for 'containers.storage'
 pkgname=containers.storage
 version=1.37.3
-revision=1
+revision=2
 hostmakedepends="go-md2man"
+depends="fuse-overlayfs"
 short_desc="Storage configuration shared by podman, buildah, and skopeo"
 maintainer="Cameron Nemo <cam@nohom.org>"
 license="Apache-2.0"
@@ -17,5 +18,6 @@ do_build() {
 
 do_install() {
 	vman "$_manpage"
+	vsed -e 's/^#mount_program/mount_program/' -i storage.conf
 	vinstall storage.conf 0644 usr/share/containers
 }

Re: [PR REVIEW] containers.storage: improve ZFS compatibility

[ahesford]

[-- Attachment #1: Type: text/plain, Size: 460 bytes --]

New review comment by ahesford on void-packages repository

https://github.com/void-linux/void-packages/pull/41220#discussion_r1054728214

Comment:
```suggestion
	vsed -e 's/^#mount_program = "/mount_program = "/' -i storage.conf
```

I would either anchor this a bit more to avoid unintentionally uncommenting a descriptive line like

> #mount_program can be set to [...]

should it somebody add that upstream. Alternatively, carry an explicit patch.

Re: [PR PATCH] [Updated] containers.storage: improve ZFS compatibility

[CameronNemo]

[-- Attachment #1: Type: text/plain, Size: 1408 bytes --]

There is an updated pull request by CameronNemo against master on the void-packages repository

https://github.com/CameronNemo/void-packages containers-storage
https://github.com/void-linux/void-packages/pull/41220

containers.storage: improve ZFS compatibility
Based on feedback from @ahesford

ZFS does not support OverlayFS by default, so the fuse-overlayfs mount
program should be configured to workaround.

<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/41220.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-containers-storage-41220.patch --]
[-- Type: text/x-diff, Size: 1143 bytes --]

From 4c4a7cb9e439c5a4188bd7f85262ca123d78b360 Mon Sep 17 00:00:00 2001
From: Cameron Nemo <cam@nohom.org>
Date: Wed, 21 Dec 2022 10:52:32 -0800
Subject: [PATCH] containers.storage: improve ZFS compatibility

ZFS does not support OverlayFS by default, so the fuse-overlayfs mount
program should be configured to workaround.
---
 srcpkgs/containers.storage/template | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/containers.storage/template b/srcpkgs/containers.storage/template
index 6ae5700af4a1..55200c6b8898 100644
--- a/srcpkgs/containers.storage/template
+++ b/srcpkgs/containers.storage/template
@@ -1,8 +1,9 @@
 # Template file for 'containers.storage'
 pkgname=containers.storage
 version=1.37.3
-revision=1
+revision=2
 hostmakedepends="go-md2man"
+depends="fuse-overlayfs"
 short_desc="Storage configuration shared by podman, buildah, and skopeo"
 maintainer="Cameron Nemo <cam@nohom.org>"
 license="Apache-2.0"
@@ -17,5 +18,6 @@ do_build() {
 
 do_install() {
 	vman "$_manpage"
+	vsed -e 's/^#mount_program = "/mount_program = "/' -i storage.conf
 	vinstall storage.conf 0644 usr/share/containers
 }

Re: [PR REVIEW] containers.storage: improve ZFS compatibility

[CameronNemo]

[-- Attachment #1: Type: text/plain, Size: 223 bytes --]

New review comment by CameronNemo on void-packages repository

https://github.com/void-linux/void-packages/pull/41220#discussion_r1054740901

Comment:
Alright made this change to the pattern. Not opposed to explicit patch.

Re: containers.storage: improve ZFS compatibility

[CameronNemo]

[-- Attachment #1: Type: text/plain, Size: 501 bytes --]

New comment by CameronNemo on void-packages repository

https://github.com/void-linux/void-packages/pull/41220#issuecomment-1361964196

Comment:
>is there any reason why somebody not on ZFS would find the change objectionable?

It works fine for me when not using ZFS. I assume that performance could be negatively affected. Those looking to squeeze storage performance might find it helpful to copy `/usr/share/containers/storage.conf` to `/etc/containers/storage.conf` and customize as necessary.

Re: containers.storage: improve ZFS compatibility

[ahesford]

[-- Attachment #1: Type: text/plain, Size: 413 bytes --]

New comment by ahesford on void-packages repository

https://github.com/void-linux/void-packages/pull/41220#issuecomment-1361993429

Comment:
Thanks for this. Because I've never found storage performance in `podman` to be bad enough to take notice, I'll assume any penalty is a non-issue for most people. I think ZFS is working toward proper overlay support, so eventually we can probably drop this modification.

Re: [PR PATCH] [Merged]: containers.storage: improve ZFS compatibility

[ahesford]

[-- Attachment #1: Type: text/plain, Size: 1233 bytes --]

There's a merged pull request on the void-packages repository

containers.storage: improve ZFS compatibility
https://github.com/void-linux/void-packages/pull/41220

Description:
Based on feedback from @ahesford

ZFS does not support OverlayFS by default, so the fuse-overlayfs mount
program should be configured to workaround.

<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->