Commit d87c4e1a authored by Jörg Thalheim's avatar Jörg Thalheim
Browse files

digital-ocean: make it easier to use disko 

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).
parent 20f77aa0

nixos/modules/virtualisation/digital-ocean-config.nix

+3 −3
Original line number Diff line number Diff line
@@ -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,8 +41,8 @@ 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";

        loader.grub = {

          devices = lib.mkDefault ["/dev/vda"];

          timeout = 0;

          grub.configurationLimit = 0;

        };