commit 6c443658e6ed54bbe0ddb5f07dca91ca4db7ef8f · pyrox.dev/nixpkgs

+5 -10

nixos/modules/virtualisation/azure-common.nix

···

       5
       5
        
         ...

     

       6
       6
        
       }:

     

       7
       7
        
       

     

       8
       8
       -
       with lib;

     

       9
       8
        
       let

     

       10
       9
        
         cfg = config.virtualisation.azure;

     

       11
       10
        
         mlxDrivers = [

     
···

       16
       15
        
       in

     

       17
       16
        
       {

     

       18
       17
        
         options.virtualisation.azure = {

     

       19
       19
       -
           acceleratedNetworking = mkOption {

     

       18
       18
       +
           acceleratedNetworking = lib.mkOption {

     

       20
       19
        
             default = false;

     

       21
       20
        
             description = "Whether the machine's network interface has enabled accelerated networking.";

     

       22
       21
        
           };

     
···

       68
       67
        
           services.openssh.settings.ClientAliveInterval = 180;

     

       69
       68
        
       

     

       70
       69
        
           # Force getting the hostname from Azure

     

       71
       71
       -
           networking.hostName = mkDefault "";

     

       70
       70
       +
           networking.hostName = lib.mkDefault "";

     

       72
       71
        
       

     

       73
       72
        
           # Always include cryptsetup so that NixOps can use it.

     

       74
       73
        
           # sg_scan is needed to finalize disk removal on older kernels

     
···

       79
       78
        
       

     

       80
       79
        
           networking.usePredictableInterfaceNames = false;

     

       81
       80
        
       

     

       82
       82
       -
           services.udev.extraRules =

     

       83
       83
       -
             with builtins;

     

       84
       84
       -
             concatStringsSep "\n" (

     

       85
       85
       -
               map (i: ''

     

       86
       86
       -
                 ENV{DEVTYPE}=="disk", KERNEL!="sda" SUBSYSTEM=="block", SUBSYSTEMS=="scsi", KERNELS=="?:0:0:${toString i}", ATTR{removable}=="0", SYMLINK+="disk/by-lun/${toString i}"

     

       87
       87
       -
               '') (lib.range 1 15)

     

       88
       88
       -
             );

     

       81
       81
       +
           services.udev.extraRules = lib.concatMapStrings (i: ''

     

       82
       82
       +
             ENV{DEVTYPE}=="disk", KERNEL!="sda" SUBSYSTEM=="block", SUBSYSTEMS=="scsi", KERNELS=="?:0:0:${toString i}", ATTR{removable}=="0", SYMLINK+="disk/by-lun/${toString i}"

     

       83
       83
       +
           '') (lib.range 1 15);

     

       89
       84
        
         };

     

       90
       85
        
       }

+2 -2

nixos/modules/virtualisation/azure-config-user.nix

···

       13
       13
        
           "${modulesPath}/virtualisation/azure-image.nix"

     

       14
       14
        
         ];

     

       15
       15
        
       

     

       16
       16
       -
         # Please update the VM Generation to the actual value

     

       17
       17
       -
         virtualisation.azureImage.vmGeneration = "v1";

     

       16
       16
       +
         # Please set the VM Generation to the actual value

     

       17
       17
       +
         # virtualisation.azureImage.vmGeneration = "v1";

     

       18
       18
        
       }