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

nixos/documentation: Remove systemd/initrd dependency

Browse Source 
Working towards a unit-testable documentation module.
This commit is contained in:
Robert Hensing 2022-07-14 11:51:04 +02:00
parent 08e6f45747
commit ec3e1c6a3a
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
nixos/modules/misc/version.nix
View File

@ -45,6 +45,12 @@ in
(mkRenamedOptionModule [ "system" "nixosLabel" ] [ "system" "nixos" "label" ]) (mkRenamedOptionModule [ "system" "nixosLabel" ] [ "system" "nixos" "label" ])
]; ];
options.boot.initrd.osRelease = mkOption {
internal = true;
readOnly = true;
default = initrdRelease;
};
options.system = { options.system = {
nixos.version = mkOption { nixos.version = mkOption {
@ -143,11 +149,6 @@ in
"os-release".text = attrsToText osReleaseContents; "os-release".text = attrsToText osReleaseContents;
}; };
boot.initrd.systemd.contents = {
"/etc/os-release".source = initrdRelease;
"/etc/initrd-release".source = initrdRelease;
};
# We have to use `warnings` because when warning in the default of the option # We have to use `warnings` because when warning in the default of the option
# the warning would also be shown when building the manual since the manual # the warning would also be shown when building the manual since the manual
# has to evaluate the default. # has to evaluate the default.

3
nixos/modules/system/boot/systemd/initrd.nix
View File

@ -359,6 +359,9 @@ in {
''; '';
"/etc/modprobe.d/debian.conf".source = pkgs.kmod-debian-aliases; "/etc/modprobe.d/debian.conf".source = pkgs.kmod-debian-aliases;
"/etc/os-release".source = config.boot.initrd.osRelease;
"/etc/initrd-release".source = config.boot.initrd.osRelease;
}; };
storePaths = [ storePaths = [