diff options
author | Jörg Thalheim <Mic92@users.noreply.github.com> | 2024-04-10 09:08:20 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-04-10 09:08:20 +0200 |
commit | 949fe90552a65bb7c03d72dd03e3e1383c5f9122 (patch) | |
tree | 25178328e7768f672e537e5688acf5cf8e7d975b /nixos | |
parent | d548ff99c6c0c0c4a8dec7737a665aac56601179 (diff) | |
parent | 3f71d1bc02b6100222e440a6ad0571d8e0db4896 (diff) |
Merge pull request #297640 from Mic92/digitalocean
digital-ocean: 'make it easier to use disko' and 'no longer disable multiple nixos generations in bootloader'
Diffstat (limited to 'nixos')
-rw-r--r-- | nixos/modules/virtualisation/digital-ocean-config.nix | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/nixos/modules/virtualisation/digital-ocean-config.nix b/nixos/modules/virtualisation/digital-ocean-config.nix index e004b7880aad0..ea297e0c23a7d 100644 --- a/nixos/modules/virtualisation/digital-ocean-config.nix +++ b/nixos/modules/virtualisation/digital-ocean-config.nix @@ -31,7 +31,7 @@ with lib; hostName = config.networking.hostName; doMetadataFile = "/run/do-metadata/v1.json"; in mkMerge [{ - fileSystems."/" = { + fileSystems."/" = lib.mkDefault { device = "/dev/disk/by-label/nixos"; autoResize = true; fsType = "ext4"; @@ -41,11 +41,7 @@ with lib; kernelParams = [ "console=ttyS0" "panic=1" "boot.panic_on_fail" ]; initrd.kernelModules = [ "virtio_scsi" ]; kernelModules = [ "virtio_pci" "virtio_net" ]; - loader = { - grub.device = "/dev/vda"; - timeout = 0; - grub.configurationLimit = 0; - }; + loader.grub.devices = lib.mkDefault ["/dev/vda"]; }; services.openssh = { enable = mkDefault true; |