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

digital-ocean: make it easier to use disko

Browse Source 
If the user provides a `fileSystems."/".device` option, it should have
higher precedence than the default value.
Same for `loader.grub.devices` (also set by disko internally).
This commit is contained in:
Jörg Thalheim 2024-03-21 08:05:23 +01:00
parent 20f77aa099
commit d87c4e1a72
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
nixos/modules/virtualisation/digital-ocean-config.nix
View File

@ -31,7 +31,7 @@ with lib;
hostName = config.networking.hostName; hostName = config.networking.hostName;
doMetadataFile = "/run/do-metadata/v1.json"; doMetadataFile = "/run/do-metadata/v1.json";
in mkMerge [{ in mkMerge [{
fileSystems."/" = { fileSystems."/" = lib.mkDefault {
device = "/dev/disk/by-label/nixos"; device = "/dev/disk/by-label/nixos";
autoResize = true; autoResize = true;
fsType = "ext4"; fsType = "ext4";
@ -41,8 +41,8 @@ with lib;
kernelParams = [ "console=ttyS0" "panic=1" "boot.panic_on_fail" ]; kernelParams = [ "console=ttyS0" "panic=1" "boot.panic_on_fail" ];
initrd.kernelModules = [ "virtio_scsi" ]; initrd.kernelModules = [ "virtio_scsi" ];
kernelModules = [ "virtio_pci" "virtio_net" ]; kernelModules = [ "virtio_pci" "virtio_net" ];
loader = { loader.grub = {
grub.device = "/dev/vda"; devices = lib.mkDefault ["/dev/vda"];
timeout = 0; timeout = 0;
grub.configurationLimit = 0; grub.configurationLimit = 0;
}; };