qbit/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Improve assertions for etc.overlay and systemd-sysusers (#332516)

Browse Source
This commit is contained in:
Jörg Thalheim 2024-09-23 17:01:30 +02:00 committed by GitHub
commit 15f80d9120
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 2 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
nixos/modules/system/boot/systemd/sysusers.nix
View File

@ -68,14 +68,10 @@ in
assertion = config.system.activationScripts.users == ""; assertion = config.system.activationScripts.users == "";
message = "system.activationScripts.users has to be empty to use systemd-sysusers"; message = "system.activationScripts.users has to be empty to use systemd-sysusers";
} }
{
assertion = config.users.mutableUsers -> config.system.etc.overlay.enable;
message = "config.users.mutableUsers requires config.system.etc.overlay.enable.";
}
] ++ (lib.mapAttrsToList ] ++ (lib.mapAttrsToList
(_username: opts: { (username: opts: {
assertion = !opts.isNormalUser; assertion = !opts.isNormalUser;
message = "systemd-sysusers doesn't create normal users. You can currently only use it to create system users."; message = "${username} is a normal user. systemd-sysusers doesn't create normal users, only system users.";
}) })
userCfg.users) userCfg.users)
++ lib.mapAttrsToList ++ lib.mapAttrsToList

7
nixos/modules/system/etc/etc-activation.nix
View File

@ -26,13 +26,6 @@
assertion = lib.versionAtLeast config.boot.kernelPackages.kernel.version "6.6"; assertion = lib.versionAtLeast config.boot.kernelPackages.kernel.version "6.6";
message = "`system.etc.overlay.enable requires a newer kernel, at least version 6.6"; message = "`system.etc.overlay.enable requires a newer kernel, at least version 6.6";
} }
{
assertion = config.systemd.sysusers.enable -> (config.users.mutableUsers == config.system.etc.overlay.mutable);
message = ''
When using systemd-sysusers and mounting `/etc` via an overlay, users
can only be mutable when `/etc` is mutable and vice versa.
'';
}
]; ];
boot.initrd.availableKernelModules = [ "loop" "erofs" "overlay" ]; boot.initrd.availableKernelModules = [ "loop" "erofs" "overlay" ];