diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2023-02-28 12:01:17 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-02-28 12:01:17 +0000 |
| commit | 7379f7a77e3bb49681f97443d115fde203679363 (patch) | |
| tree | 7fdcf751ff6259f016c1dc8133ac2f63e7539944 /nixos | |
| parent | f610d5f5d6ecb7d74dc20d99bf97bf8ab5bfbf2a (diff) | |
| parent | 6290a4f91a85e07749d2e0146f0d722bae05e1c6 (diff) | |
| download | nixlib-7379f7a77e3bb49681f97443d115fde203679363.tar nixlib-7379f7a77e3bb49681f97443d115fde203679363.tar.gz nixlib-7379f7a77e3bb49681f97443d115fde203679363.tar.bz2 nixlib-7379f7a77e3bb49681f97443d115fde203679363.tar.lz nixlib-7379f7a77e3bb49681f97443d115fde203679363.tar.xz nixlib-7379f7a77e3bb49681f97443d115fde203679363.tar.zst nixlib-7379f7a77e3bb49681f97443d115fde203679363.zip | |
Merge master into staging-next
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; |