diff options
author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2023-11-09 00:02:14 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-11-09 00:02:14 +0000 |
commit | 00a0662a3ca0e36397dcc5e3244a7286d46232d4 (patch) | |
tree | 6b72401855a55cc3960620c4e3428b3abbb79086 /nixos | |
parent | 536833ef29720974616732e7de73991d3056ca3a (diff) | |
parent | 1e45a2364239087f7fae9a0dcc97cbdd29aabc78 (diff) | |
download | nixpkgs-00a0662a3ca0e36397dcc5e3244a7286d46232d4.tar nixpkgs-00a0662a3ca0e36397dcc5e3244a7286d46232d4.tar.gz nixpkgs-00a0662a3ca0e36397dcc5e3244a7286d46232d4.tar.bz2 nixpkgs-00a0662a3ca0e36397dcc5e3244a7286d46232d4.tar.lz nixpkgs-00a0662a3ca0e36397dcc5e3244a7286d46232d4.tar.xz nixpkgs-00a0662a3ca0e36397dcc5e3244a7286d46232d4.tar.zst nixpkgs-00a0662a3ca0e36397dcc5e3244a7286d46232d4.zip |
Merge master into staging-next
Diffstat (limited to 'nixos')
-rw-r--r-- | nixos/doc/manual/release-notes/rl-2311.section.md | 2 | ||||
-rw-r--r-- | nixos/modules/services/networking/trust-dns.nix | 4 | ||||
-rw-r--r-- | nixos/modules/virtualisation/google-compute-image.nix | 8 |
3 files changed, 12 insertions, 2 deletions
diff --git a/nixos/doc/manual/release-notes/rl-2311.section.md b/nixos/doc/manual/release-notes/rl-2311.section.md index 237de20f5cc..8fa8fb5e594 100644 --- a/nixos/doc/manual/release-notes/rl-2311.section.md +++ b/nixos/doc/manual/release-notes/rl-2311.section.md @@ -497,6 +497,8 @@ The module update takes care of the new config syntax and the data itself (user - `keepTerminfo` controls whether `TERMINFO` and `TERMINFO_DIRS` are preserved for `root` and the `wheel` group. +- `virtualisation.googleComputeImage` now provides `efi` option to support UEFI booting. + - CoreDNS can now be built with external plugins by overriding `externalPlugins` and `vendorHash` arguments like this: ``` diff --git a/nixos/modules/services/networking/trust-dns.nix b/nixos/modules/services/networking/trust-dns.nix index 4196d124a2a..758e33f16d3 100644 --- a/nixos/modules/services/networking/trust-dns.nix +++ b/nixos/modules/services/networking/trust-dns.nix @@ -54,7 +54,7 @@ in defaultText = "pkgs.trust-dns"; description = mdDoc '' Trust-dns package to use. - Only `bin/trust-dns` need be provided: the other trust-dns utilities (client and resolver) are not needed. + The package must provide `meta.mainProgram` which names the server binary; any other utilities (client, resolver) are not needed. ''; }; quiet = mkOption { @@ -135,7 +135,7 @@ in flags = (lib.optional cfg.debug "--debug") ++ (lib.optional cfg.quiet "--quiet"); flagsStr = builtins.concatStringsSep " " flags; in '' - ${cfg.package}/bin/trust-dns --config ${configFile} ${flagsStr} + ${cfg.package}/bin/${cfg.package.meta.mainProgram} --config ${configFile} ${flagsStr} ''; Type = "simple"; Restart = "on-failure"; diff --git a/nixos/modules/virtualisation/google-compute-image.nix b/nixos/modules/virtualisation/google-compute-image.nix index 197ebb18b9a..dcdd1b59eef 100644 --- a/nixos/modules/virtualisation/google-compute-image.nix +++ b/nixos/modules/virtualisation/google-compute-image.nix @@ -44,10 +44,17 @@ in GZIP compression level of the resulting disk image (1-9). ''; }; + virtualisation.googleComputeImage.efi = mkEnableOption "EFI booting"; }; #### implementation config = { + boot.initrd.availableKernelModules = [ "nvme" ]; + boot.loader.grub = mkIf cfg.efi { + device = mkForce "nodev"; + efiSupport = true; + efiInstallAsRemovable = true; + }; system.build.googleComputeImage = import ../../lib/make-disk-image.nix { name = "google-compute-image"; @@ -62,6 +69,7 @@ in ''; format = "raw"; configFile = if cfg.configFile == null then defaultConfigFile else cfg.configFile; + partitionTableType = if cfg.efi then "efi" else "legacy"; inherit (cfg) diskSize; inherit config lib pkgs; }; |