summary refs log tree commit diff
path: root/nixos/modules/system/boot/systemd.nix
diff options
context:
space:
mode:
authorFrederik Rietdijk <fridh@fridh.nl>2020-08-07 23:02:23 +0200
committerFrederik Rietdijk <fridh@fridh.nl>2020-08-07 23:02:23 +0200
commitcb634b2aa5bced67cd4590bbd68f87fb0c320e32 (patch)
treec8f33ed2284bd334c9b042d398104af627d46f62 /nixos/modules/system/boot/systemd.nix
parent792f562ad546735c0b4ccea6b06813da03eb9c8e (diff)
parent6a201763b472b53355234477b202dcc6aeedaebc (diff)
downloadnixpkgs-cb634b2aa5bced67cd4590bbd68f87fb0c320e32.tar
nixpkgs-cb634b2aa5bced67cd4590bbd68f87fb0c320e32.tar.gz
nixpkgs-cb634b2aa5bced67cd4590bbd68f87fb0c320e32.tar.bz2
nixpkgs-cb634b2aa5bced67cd4590bbd68f87fb0c320e32.tar.lz
nixpkgs-cb634b2aa5bced67cd4590bbd68f87fb0c320e32.tar.xz
nixpkgs-cb634b2aa5bced67cd4590bbd68f87fb0c320e32.tar.zst
nixpkgs-cb634b2aa5bced67cd4590bbd68f87fb0c320e32.zip
Merge staging-next into staging
Diffstat (limited to 'nixos/modules/system/boot/systemd.nix')
-rw-r--r--nixos/modules/system/boot/systemd.nix4
1 files changed, 2 insertions, 2 deletions
diff --git a/nixos/modules/system/boot/systemd.nix b/nixos/modules/system/boot/systemd.nix
index b0828a923de..43cd2652b08 100644
--- a/nixos/modules/system/boot/systemd.nix
+++ b/nixos/modules/system/boot/systemd.nix
@@ -73,7 +73,7 @@ let
       "systemd-journald.service"
       "systemd-journal-flush.service"
       "systemd-journal-catalog-update.service"
-      "systemd-journald-audit.socket"
+      ] ++ (optional (!config.boot.isContainer) "systemd-journald-audit.socket") ++ [
       "systemd-journald-dev-log.socket"
       "syslog.socket"
 
@@ -101,7 +101,7 @@ let
       "dev-hugepages.mount"
       "dev-mqueue.mount"
       "sys-fs-fuse-connections.mount"
-      "sys-kernel-config.mount"
+      ] ++ (optional (!config.boot.isContainer) "sys-kernel-config.mount") ++ [
       "sys-kernel-debug.mount"
 
       # Maintaining state across reboots.