summary refs log tree commit diff
path: root/nixos/modules/system
diff options
context:
space:
mode:
authorFlorian Klink <flokli@flokli.de>2023-03-13 17:37:39 +0100
committerGitHub <noreply@github.com>2023-03-13 17:37:39 +0100
commit504d66bae9702001359a875421642c409a332784 (patch)
tree20675646a852c09adcd123e875a880b48cd7c592 /nixos/modules/system
parenta9b7d738fc1437f8d796607ed31093921685b2b4 (diff)
parent91dd01a3065dbf60df1725681899b02afa444f18 (diff)
downloadnixpkgs-504d66bae9702001359a875421642c409a332784.tar
nixpkgs-504d66bae9702001359a875421642c409a332784.tar.gz
nixpkgs-504d66bae9702001359a875421642c409a332784.tar.bz2
nixpkgs-504d66bae9702001359a875421642c409a332784.tar.lz
nixpkgs-504d66bae9702001359a875421642c409a332784.tar.xz
nixpkgs-504d66bae9702001359a875421642c409a332784.tar.zst
nixpkgs-504d66bae9702001359a875421642c409a332784.zip
Merge pull request #216826 from gdamjan/systemd-253
systemd: 252.5 -> 253
Diffstat (limited to 'nixos/modules/system')
-rw-r--r--nixos/modules/system/boot/systemd.nix2
-rw-r--r--nixos/modules/system/boot/systemd/initrd.nix2
2 files changed, 4 insertions, 0 deletions
diff --git a/nixos/modules/system/boot/systemd.nix b/nixos/modules/system/boot/systemd.nix
index 8b20f9a7e87..5ff99b14dee 100644
--- a/nixos/modules/system/boot/systemd.nix
+++ b/nixos/modules/system/boot/systemd.nix
@@ -79,6 +79,8 @@ let
       # Filesystems.
       "systemd-fsck@.service"
       "systemd-fsck-root.service"
+      "systemd-growfs@.service"
+      "systemd-growfs-root.service"
       "systemd-remount-fs.service"
       "systemd-pstore.service"
       "local-fs.target"
diff --git a/nixos/modules/system/boot/systemd/initrd.nix b/nixos/modules/system/boot/systemd/initrd.nix
index f937581b76f..ffe96f3ad9c 100644
--- a/nixos/modules/system/boot/systemd/initrd.nix
+++ b/nixos/modules/system/boot/systemd/initrd.nix
@@ -56,6 +56,7 @@ let
     "systemd-ask-password-console.path"
     "systemd-ask-password-console.service"
     "systemd-fsck@.service"
+    "systemd-growfs@.service"
     "systemd-halt.service"
     "systemd-hibernate-resume@.service"
     "systemd-journald-audit.socket"
@@ -371,6 +372,7 @@ in {
       managerEnvironment.PATH = "/bin:/sbin";
 
       contents = {
+        "/tmp/.keep".text = "systemd requires the /tmp mount point in the initrd cpio archive";
         "/init".source = "${cfg.package}/lib/systemd/systemd";
         "/etc/systemd/system".source = stage1Units;