diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2023-02-28 12:01:54 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-02-28 12:01:54 +0000 |
| commit | 445e4a4069abc48b6032ed7a37ddb059d977ab95 (patch) | |
| tree | a4de3dc90d8f8b834602269c70b8645adaad1808 /nixos | |
| parent | 1db7f30d1f96bab9512029b16a427ec2c7e81432 (diff) | |
| parent | 7379f7a77e3bb49681f97443d115fde203679363 (diff) | |
| download | nixlib-445e4a4069abc48b6032ed7a37ddb059d977ab95.tar nixlib-445e4a4069abc48b6032ed7a37ddb059d977ab95.tar.gz nixlib-445e4a4069abc48b6032ed7a37ddb059d977ab95.tar.bz2 nixlib-445e4a4069abc48b6032ed7a37ddb059d977ab95.tar.lz nixlib-445e4a4069abc48b6032ed7a37ddb059d977ab95.tar.xz nixlib-445e4a4069abc48b6032ed7a37ddb059d977ab95.tar.zst nixlib-445e4a4069abc48b6032ed7a37ddb059d977ab95.zip | |
Merge staging-next into staging
Diffstat (limited to 'nixos')
| -rw-r--r-- | nixos/modules/virtualisation/podman/default.nix | 8 | ||||
| -rw-r--r-- | nixos/tests/podman/default.nix | 4 |
2 files changed, 4 insertions, 8 deletions
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 = [ 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; |