Skip to content

nixos/systemd: make sure all the device nodes are created in stage1 #179693

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
K900 wants to merge 1 commit into from
Closed

nixos/systemd: make sure all the device nodes are created in stage1 #179693

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions nixos/modules/system/boot/systemd.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -592,6 +592,9 @@ in
systemd.services.systemd-importd.environment = proxy_env;
systemd.services.systemd-pstore.wantedBy = [ "sysinit.target" ]; # see #81138

# NixOS has kernel modules in a different location
systemd.services.kmod-static-nodes.unitConfig.ConditionFileNotEmpty = "/run/booted-system/kernel-modules/lib/modules/%v/modules.devname";

# Don't bother with certain units in containers.
systemd.services.systemd-remount-fs.unitConfig.ConditionVirtualization = "!container";
systemd.services.systemd-random-seed.unitConfig.ConditionVirtualization = "!container";
Expand Down
4 changes: 4 additions & 0 deletions nixos/modules/system/boot/systemd/initrd.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -420,6 +420,10 @@ in {
services."systemd-makefs@" = lib.mkIf needMakefs { unitConfig.IgnoreOnIsolate = true; };
services."systemd-growfs@" = lib.mkIf needGrowfs { unitConfig.IgnoreOnIsolate = true; };

# make sure all the /dev nodes are set up
services.kmod-static-nodes.unitConfig.ConditionFileNotEmpty = "/lib/modules/%v/modules.devname";
services.systemd-tmpfiles-setup-dev.wantedBy = ["sysinit.target"];

services.initrd-nixos-activation = {
after = [ "initrd-fs.target" ];
requiredBy = [ "initrd.target" ];
Expand Down
5 changes: 2 additions & 3 deletions ...os-specific/linux/systemd/0016-kmod-static-nodes.service-Update-ConditionFileNotEmp.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,9 @@ index 777e82d16b..b6abc2bba0 100644
Before=sysinit.target systemd-tmpfiles-setup-dev.service
ConditionCapability=CAP_SYS_MODULE
-ConditionFileNotEmpty=/lib/modules/%v/modules.devname
+ConditionFileNotEmpty=/run/booted-system/kernel-modules/lib/modules/%v/modules.devname


[Service]
Type=oneshot
--
--
2.34.0