about summary refs log tree commit diff
path: root/nixos
diff options
context:
space:
mode:
authorAndré Schröder <andre.schroeder@andresco.de>2024-04-21 11:36:17 +0200
committerAndré Schröder <andre.schroeder@andresco.de>2024-04-21 11:36:17 +0200
commit168793f151a0f2827c4eedc8ded2e149ab0300e4 (patch)
treed08d1689cbdb9521869ddb6c1e23708cf950d0ad /nixos
parent5c24cf2f0a12ad855f444c30b2421d044120c66f (diff)
digital-ocean: revert "make it easier to use disko"
This reverts parts of commit d87c4e1a720f827996c282d0e194850a8903cebe from @Mic92

After switching from nixos-23.11 to nixos-unstable, I got the following error:

```
$ nixos-rebuild switch --flake nixos/#digitalocean
...
error:
Failed assertions:
- You must set the option ‘boot.loader.grub.devices’ or 'boot.loader.grub.mirroredBoots' to make the system bootable.
```

In my nixos config I don't set boot.loader.grub.devices or boot.loader.grub.mirroredBoots explicitly.

It seems like the values are not really defaulted via mkDefault? I am still relatively new to Nix, not sure how to fix this properly, so I am proposing to revert this change.
Diffstat (limited to 'nixos')
-rw-r--r--nixos/modules/virtualisation/digital-ocean-config.nix2
1 files changed, 1 insertions, 1 deletions
diff --git a/nixos/modules/virtualisation/digital-ocean-config.nix b/nixos/modules/virtualisation/digital-ocean-config.nix
index 2d5bc0661d48d..4ef2b85551c66 100644
--- a/nixos/modules/virtualisation/digital-ocean-config.nix
+++ b/nixos/modules/virtualisation/digital-ocean-config.nix
@@ -41,7 +41,7 @@ with lib;
         kernelParams = [ "console=ttyS0" "panic=1" "boot.panic_on_fail" ];
         initrd.kernelModules = [ "virtio_scsi" ];
         kernelModules = [ "virtio_pci" "virtio_net" ];
-        loader.grub.devices = lib.mkDefault ["/dev/vda"];
+        loader.grub.devices = ["/dev/vda"];
       };
       services.openssh = {
         enable = mkDefault true;