diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2024-02-09 00:02:27 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-02-09 00:02:27 +0000 |
| commit | 592e5dab715e6e4be96e13cde15073e94d00de6c (patch) | |
| tree | 3fb4ac99e50c2e188ec6b8aceb1d732e0c6418e3 /nixos | |
| parent | 13d222c591f2c2a74bcf19f046f76fa3531bf98a (diff) | |
| parent | 4441de75cb87dd21c4249989496ca193bc51f44b (diff) | |
| download | nixlib-592e5dab715e6e4be96e13cde15073e94d00de6c.tar nixlib-592e5dab715e6e4be96e13cde15073e94d00de6c.tar.gz nixlib-592e5dab715e6e4be96e13cde15073e94d00de6c.tar.bz2 nixlib-592e5dab715e6e4be96e13cde15073e94d00de6c.tar.lz nixlib-592e5dab715e6e4be96e13cde15073e94d00de6c.tar.xz nixlib-592e5dab715e6e4be96e13cde15073e94d00de6c.tar.zst nixlib-592e5dab715e6e4be96e13cde15073e94d00de6c.zip | |
Merge master into staging-next
Diffstat (limited to 'nixos')
| -rw-r--r-- | nixos/modules/system/boot/uki.nix | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/nixos/modules/system/boot/uki.nix b/nixos/modules/system/boot/uki.nix index 63c4e0c0e391..63a7cbc5967b 100644 --- a/nixos/modules/system/boot/uki.nix +++ b/nixos/modules/system/boot/uki.nix @@ -51,16 +51,16 @@ in else "nixos"); - boot.uki.settings = lib.mkOptionDefault { + boot.uki.settings = { UKI = { - Linux = "${config.boot.kernelPackages.kernel}/${config.system.boot.loader.kernelFile}"; - Initrd = "${config.system.build.initialRamdisk}/${config.system.boot.loader.initrdFile}"; - Cmdline = "init=${config.system.build.toplevel}/init ${toString config.boot.kernelParams}"; - Stub = "${pkgs.systemd}/lib/systemd/boot/efi/linux${efiArch}.efi.stub"; - Uname = "${config.boot.kernelPackages.kernel.modDirVersion}"; - OSRelease = "@${config.system.build.etc}/etc/os-release"; + Linux = lib.mkOptionDefault "${config.boot.kernelPackages.kernel}/${config.system.boot.loader.kernelFile}"; + Initrd = lib.mkOptionDefault "${config.system.build.initialRamdisk}/${config.system.boot.loader.initrdFile}"; + Cmdline = lib.mkOptionDefault "init=${config.system.build.toplevel}/init ${toString config.boot.kernelParams}"; + Stub = lib.mkOptionDefault "${pkgs.systemd}/lib/systemd/boot/efi/linux${efiArch}.efi.stub"; + Uname = lib.mkOptionDefault "${config.boot.kernelPackages.kernel.modDirVersion}"; + OSRelease = lib.mkOptionDefault "@${config.system.build.etc}/etc/os-release"; # This is needed for cross compiling. - EFIArch = efiArch; + EFIArch = lib.mkOptionDefault efiArch; }; }; |