From 48642c634e51b949d3ea01f09c28c83f9aa824d9 Mon Sep 17 00:00:00 2001
From: zowoq <59103226+zowoq@users.noreply.github.com>
Date: Sat, 18 Feb 2023 20:58:23 +1000
Subject: podman: remove wrapper

trying to get all of the podman functionality to work with the wrapper
 is becoming more complicated with each release, it isn't sustainable

removing the wrapper does mean that using extraPackages will need to build from source

- remove unnecessary serviceConfig overrides

- set HELPER_BINARIES_DIR to libexec/podman

- use install.bin target on linux for podman/tmpfiles
  - also installs quadlet/rootlessport in libexec

- symlink binaries from helpersBin into HELPER_BINARIES_DIR

- remove unnecessary rootlessport output

- remove unnecessary substituteInPlace
---
 nixos/modules/virtualisation/podman/default.nix | 8 --------
 1 file changed, 8 deletions(-)

(limited to 'nixos')

diff --git a/nixos/modules/virtualisation/podman/default.nix b/nixos/modules/virtualisation/podman/default.nix
index baca48305188..83ddba3ce06e 100644
--- a/nixos/modules/virtualisation/podman/default.nix
+++ b/nixos/modules/virtualisation/podman/default.nix
@@ -183,10 +183,6 @@ in
 
       systemd.packages = [ cfg.package ];
 
-      systemd.services.podman.serviceConfig = {
-        ExecStart = [ "" "${cfg.package}/bin/podman $LOGGING system service" ];
-      };
-
       systemd.services.podman-prune = {
         description = "Prune podman resources";
 
@@ -207,10 +203,6 @@ in
       systemd.sockets.podman.wantedBy = [ "sockets.target" ];
       systemd.sockets.podman.socketConfig.SocketGroup = "podman";
 
-      systemd.user.services.podman.serviceConfig = {
-        ExecStart = [ "" "${cfg.package}/bin/podman $LOGGING system service" ];
-      };
-
       systemd.user.sockets.podman.wantedBy = [ "sockets.target" ];
 
       systemd.tmpfiles.packages = [
-- 
cgit 1.4.1


From 2ab049a5c7c24dab62a7c3aa53b617fb16e98092 Mon Sep 17 00:00:00 2001
From: zowoq <59103226+zowoq@users.noreply.github.com>
Date: Sun, 26 Feb 2023 11:18:43 +1000
Subject: nixos/tests/podman: add zfs to rootful test

---
 nixos/tests/podman/default.nix | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'nixos')

diff --git a/nixos/tests/podman/default.nix b/nixos/tests/podman/default.nix
index 69397197775f..0e1f420f2a7d 100644
--- a/nixos/tests/podman/default.nix
+++ b/nixos/tests/podman/default.nix
@@ -8,6 +8,10 @@ import ../make-test-python.nix (
     nodes = {
       rootful = { pkgs, ... }: {
         virtualisation.podman.enable = true;
+
+        # hack to ensure that podman built with and without zfs in extraPackages is cached
+        boot.supportedFilesystems = [ "zfs" ];
+        networking.hostId = "00000000";
       };
       rootless = { pkgs, ... }: {
         virtualisation.podman.enable = true;
-- 
cgit 1.4.1