commit 094f2b6c9d87da6348e2517936a3ad907c82d1cf · pyrox.dev/nixpkgs

+34

nixos/maintainers/scripts/incus/incus-container-image-inner.nix

···

       1
       1
       +
       # Edit this configuration file to define what should be installed on

     

       2
       2
       +
       # your system.  Help is available in the configuration.nix(5) man page

     

       3
       3
       +
       # and in the NixOS manual (accessible by running ‘nixos-help’).

     

       4
       4
       +
       

     

       5
       5
       +
       { modulesPath, ... }:

     

       6
       6
       +
       

     

       7
       7
       +
       {

     

       8
       8
       +
         imports = [

     

       9
       9
       +
           # Include the default incus configuration.

     

       10
       10
       +
           "${modulesPath}/virtualisation/lxc-container.nix"

     

       11
       11
       +
           # Include the container-specific autogenerated configuration.

     

       12
       12
       +
           ./incus.nix

     

       13
       13
       +
         ];

     

       14
       14
       +
       

     

       15
       15
       +
         networking = {

     

       16
       16
       +
           dhcpcd.enable = false;

     

       17
       17
       +
           useDHCP = false;

     

       18
       18
       +
           useHostResolvConf = false;

     

       19
       19
       +
         };

     

       20
       20
       +
       

     

       21
       21
       +
         systemd.network = {

     

       22
       22
       +
           enable = true;

     

       23
       23
       +
           networks."50-eth0" = {

     

       24
       24
       +
             matchConfig.Name = "eth0";

     

       25
       25
       +
             networkConfig = {

     

       26
       26
       +
               DHCP = "ipv4";

     

       27
       27
       +
               IPv6AcceptRA = true;

     

       28
       28
       +
             };

     

       29
       29
       +
             linkConfig.RequiredForOnline = "routable";

     

       30
       30
       +
           };

     

       31
       31
       +
         };

     

       32
       32
       +
       

     

       33
       33
       +
         system.stateVersion = "@stateVersion@"; # Did you read the comment?

     

       34
       34
       +
       }

+47

nixos/maintainers/scripts/incus/incus-container-image.nix

···

       1
       1
       +
       { lib, pkgs, ... }:

     

       2
       2
       +
       

     

       3
       3
       +
       {

     

       4
       4
       +
         imports = [ ../../../modules/virtualisation/lxc-container.nix ];

     

       5
       5
       +
       

     

       6
       6
       +
         virtualisation.lxc.templates.nix = {

     

       7
       7
       +
           enable = true;

     

       8
       8
       +
           target = "/etc/nixos/incus.nix";

     

       9
       9
       +
           template = ./nix.tpl;

     

       10
       10
       +
           when = [

     

       11
       11
       +
             "create"

     

       12
       12
       +
             "copy"

     

       13
       13
       +
           ];

     

       14
       14
       +
         };

     

       15
       15
       +
       

     

       16
       16
       +
         # copy the config for nixos-rebuild

     

       17
       17
       +
         system.activationScripts.config =

     

       18
       18
       +
           let

     

       19
       19
       +
             config = pkgs.substituteAll {

     

       20
       20
       +
               src = ./incus-container-image-inner.nix;

     

       21
       21
       +
               stateVersion = lib.trivial.release;

     

       22
       22
       +
             };

     

       23
       23
       +
           in

     

       24
       24
       +
           ''

     

       25
       25
       +
             if [ ! -e /etc/nixos/configuration.nix ]; then

     

       26
       26
       +
               install -m 0644 -D ${config} /etc/nixos/configuration.nix

     

       27
       27
       +
             fi

     

       28
       28
       +
           '';

     

       29
       29
       +
       

     

       30
       30
       +
         networking = {

     

       31
       31
       +
           dhcpcd.enable = false;

     

       32
       32
       +
           useDHCP = false;

     

       33
       33
       +
           useHostResolvConf = false;

     

       34
       34
       +
         };

     

       35
       35
       +
       

     

       36
       36
       +
         systemd.network = {

     

       37
       37
       +
           enable = true;

     

       38
       38
       +
           networks."50-eth0" = {

     

       39
       39
       +
             matchConfig.Name = "eth0";

     

       40
       40
       +
             networkConfig = {

     

       41
       41
       +
               DHCP = "ipv4";

     

       42
       42
       +
               IPv6AcceptRA = true;

     

       43
       43
       +
             };

     

       44
       44
       +
             linkConfig.RequiredForOnline = "routable";

     

       45
       45
       +
           };

     

       46
       46
       +
         };

     

       47
       47
       +
       }

+34

nixos/maintainers/scripts/incus/incus-virtual-machine-image-inner.nix

···

       1
       1
       +
       # Edit this configuration file to define what should be installed on

     

       2
       2
       +
       # your system.  Help is available in the configuration.nix(5) man page

     

       3
       3
       +
       # and in the NixOS manual (accessible by running ‘nixos-help’).

     

       4
       4
       +
       

     

       5
       5
       +
       { modulesPath, ... }:

     

       6
       6
       +
       

     

       7
       7
       +
       {

     

       8
       8
       +
         imports = [

     

       9
       9
       +
           # Include the default incus configuration.

     

       10
       10
       +
           "${modulesPath}/virtualisation/incus-virtual-machine.nix"

     

       11
       11
       +
           # Include the container-specific autogenerated configuration.

     

       12
       12
       +
           ./incus.nix

     

       13
       13
       +
         ];

     

       14
       14
       +
       

     

       15
       15
       +
         networking = {

     

       16
       16
       +
           dhcpcd.enable = false;

     

       17
       17
       +
           useDHCP = false;

     

       18
       18
       +
           useHostResolvConf = false;

     

       19
       19
       +
         };

     

       20
       20
       +
       

     

       21
       21
       +
         systemd.network = {

     

       22
       22
       +
           enable = true;

     

       23
       23
       +
           networks."50-enp5s0" = {

     

       24
       24
       +
             matchConfig.Name = "enp5s0";

     

       25
       25
       +
             networkConfig = {

     

       26
       26
       +
               DHCP = "ipv4";

     

       27
       27
       +
               IPv6AcceptRA = true;

     

       28
       28
       +
             };

     

       29
       29
       +
             linkConfig.RequiredForOnline = "routable";

     

       30
       30
       +
           };

     

       31
       31
       +
         };

     

       32
       32
       +
       

     

       33
       33
       +
         system.stateVersion = "@stateVersion@"; # Did you read the comment?

     

       34
       34
       +
       }

+48

nixos/maintainers/scripts/incus/incus-virtual-machine-image.nix

···

       1
       1
       +
       { lib, pkgs, ... }:

     

       2
       2
       +
       

     

       3
       3
       +
       {

     

       4
       4
       +
         imports = [ ../../../modules/virtualisation/incus-virtual-machine.nix ];

     

       5
       5
       +
       

     

       6
       6
       +
         virtualisation.lxc.templates.nix = {

     

       7
       7
       +
           enable = true;

     

       8
       8
       +
           target = "/etc/nixos/incus.nix";

     

       9
       9
       +
           template = ./nix.tpl;

     

       10
       10
       +
           when = [

     

       11
       11
       +
             "create"

     

       12
       12
       +
             "copy"

     

       13
       13
       +
           ];

     

       14
       14
       +
         };

     

       15
       15
       +
       

     

       16
       16
       +
         # copy the config for nixos-rebuild

     

       17
       17
       +
         system.activationScripts.config =

     

       18
       18
       +
           let

     

       19
       19
       +
             config = pkgs.substituteAll {

     

       20
       20
       +
               src = ./incus-virtual-machine-image-inner.nix;

     

       21
       21
       +
               stateVersion = lib.trivial.release;

     

       22
       22
       +
             };

     

       23
       23
       +
           in

     

       24
       24
       +
           ''

     

       25
       25
       +
             if [ ! -e /etc/nixos/configuration.nix ]; then

     

       26
       26
       +
               install -m 0644 -D ${config} /etc/nixos/configuration.nix

     

       27
       27
       +
             fi

     

       28
       28
       +
           '';

     

       29
       29
       +
       

     

       30
       30
       +
         # Network

     

       31
       31
       +
         networking = {

     

       32
       32
       +
           dhcpcd.enable = false;

     

       33
       33
       +
           useDHCP = false;

     

       34
       34
       +
           useHostResolvConf = false;

     

       35
       35
       +
         };

     

       36
       36
       +
       

     

       37
       37
       +
         systemd.network = {

     

       38
       38
       +
           enable = true;

     

       39
       39
       +
           networks."50-enp5s0" = {

     

       40
       40
       +
             matchConfig.Name = "enp5s0";

     

       41
       41
       +
             networkConfig = {

     

       42
       42
       +
               DHCP = "ipv4";

     

       43
       43
       +
               IPv6AcceptRA = true;

     

       44
       44
       +
             };

     

       45
       45
       +
             linkConfig.RequiredForOnline = "routable";

     

       46
       46
       +
           };

     

       47
       47
       +
         };

     

       48
       48
       +
       }

+12

nixos/maintainers/scripts/incus/nix.tpl

···

       1
       1
       +
       {

     

       2
       2
       +
         lib,

     

       3
       3
       +
         config,

     

       4
       4
       +
         pkgs,

     

       5
       5
       +
         ...

     

       6
       6
       +
       }:

     

       7
       7
       +
       

     

       8
       8
       +
       # WARNING: THIS CONFIGURATION IS AUTOGENERATED AND WILL BE OVERWRITTEN AUTOMATICALLY

     

       9
       9
       +
       

     

       10
       10
       +
       {

     

       11
       11
       +
         networking.hostName = "{{ container.name }}";

     

       12
       12
       +
       }

+61

nixos/modules/virtualisation/incus-virtual-machine.nix

···

       1
       1
       +
       {

     

       2
       2
       +
         config,

     

       3
       3
       +
         lib,

     

       4
       4
       +
         pkgs,

     

       5
       5
       +
         ...

     

       6
       6
       +
       }:

     

       7
       7
       +
       

     

       8
       8
       +
       let

     

       9
       9
       +
         serialDevice = if pkgs.stdenv.hostPlatform.isx86 then "ttyS0" else "ttyAMA0";

     

       10
       10
       +
       in

     

       11
       11
       +
       {

     

       12
       12
       +
         meta = {

     

       13
       13
       +
           maintainers = lib.teams.lxc.members;

     

       14
       14
       +
         };

     

       15
       15
       +
       

     

       16
       16
       +
         imports = [

     

       17
       17
       +
           ./lxc-instance-common.nix

     

       18
       18
       +
       

     

       19
       19
       +
           ../profiles/qemu-guest.nix

     

       20
       20
       +
         ];

     

       21
       21
       +
       

     

       22
       22
       +
         config = {

     

       23
       23
       +
           system.build.qemuImage = import ../../lib/make-disk-image.nix {

     

       24
       24
       +
             inherit pkgs lib config;

     

       25
       25
       +
       

     

       26
       26
       +
             partitionTableType = "efi";

     

       27
       27
       +
             format = "qcow2-compressed";

     

       28
       28
       +
             copyChannel = true;

     

       29
       29
       +
           };

     

       30
       30
       +
       

     

       31
       31
       +
           fileSystems = {

     

       32
       32
       +
             "/" = {

     

       33
       33
       +
               device = "/dev/disk/by-label/nixos";

     

       34
       34
       +
               autoResize = true;

     

       35
       35
       +
               fsType = "ext4";

     

       36
       36
       +
             };

     

       37
       37
       +
             "/boot" = {

     

       38
       38
       +
               device = "/dev/disk/by-label/ESP";

     

       39
       39
       +
               fsType = "vfat";

     

       40
       40
       +
             };

     

       41
       41
       +
           };

     

       42
       42
       +
       

     

       43
       43
       +
           boot.growPartition = true;

     

       44
       44
       +
           boot.loader.systemd-boot.enable = true;

     

       45
       45
       +
       

     

       46
       46
       +
           # image building needs to know what device to install bootloader on

     

       47
       47
       +
           boot.loader.grub.device = "/dev/vda";

     

       48
       48
       +
       

     

       49
       49
       +
           boot.kernelParams = [

     

       50
       50
       +
             "console=tty1"

     

       51
       51
       +
             "console=${serialDevice}"

     

       52
       52
       +
           ];

     

       53
       53
       +
       

     

       54
       54
       +
           # CPU hotplug

     

       55
       55
       +
           services.udev.extraRules = ''

     

       56
       56
       +
             SUBSYSTEM=="cpu", CONST{arch}=="x86-64", TEST=="online", ATTR{online}=="0", ATTR{online}="1"

     

       57
       57
       +
           '';

     

       58
       58
       +
       

     

       59
       59
       +
           virtualisation.incus.agent.enable = lib.mkDefault true;

     

       60
       60
       +
         };

     

       61
       61
       +
       }

+1 -1

nixos/modules/virtualisation/lxc-container.nix

···

       74
       74
        
             ];

     

       75
       75
        
           };

     

       76
       76
        
       

     

       77
       77
       -
           system.build.installBootLoader = pkgs.writeScript "install-lxd-sbin-init.sh" ''

     

       77
       77
       +
           system.build.installBootLoader = pkgs.writeScript "install-lxc-sbin-init.sh" ''

     

       78
       78
        
             #!${pkgs.runtimeShell}

     

       79
       79
        
             ${pkgs.coreutils}/bin/ln -fs "$1/${initScript}" /sbin/init

     

       80
       80
        
           '';

+95

nixos/release.nix

···

       318
       318
        
       

     

       319
       319
        
         );

     

       320
       320
        
       

     

       321
       321
       +
         # An image that can be imported into incus and used for container creation

     

       322
       322
       +
         incusContainerImage =

     

       323
       323
       +
           forMatchingSystems

     

       324
       324
       +
             [

     

       325
       325
       +
               "x86_64-linux"

     

       326
       326
       +
               "aarch64-linux"

     

       327
       327
       +
             ]

     

       328
       328
       +
             (

     

       329
       329
       +
               system:

     

       330
       330
       +
               with import ./.. { inherit system; };

     

       331
       331
       +
       

     

       332
       332
       +
               hydraJob (

     

       333
       333
       +
                 (import lib/eval-config.nix {

     

       334
       334
       +
                   inherit system;

     

       335
       335
       +
                   modules = [

     

       336
       336
       +
                     configuration

     

       337
       337
       +
                     versionModule

     

       338
       338
       +
                     ./maintainers/scripts/incus/incus-container-image.nix

     

       339
       339
       +
                   ];

     

       340
       340
       +
                 }).config.system.build.squashfs

     

       341
       341
       +
               )

     

       342
       342
       +
             );

     

       343
       343
       +
       

     

       344
       344
       +
         # Metadata for the incus image

     

       345
       345
       +
         incusContainerMeta =

     

       346
       346
       +
           forMatchingSystems

     

       347
       347
       +
             [

     

       348
       348
       +
               "x86_64-linux"

     

       349
       349
       +
               "aarch64-linux"

     

       350
       350
       +
             ]

     

       351
       351
       +
             (

     

       352
       352
       +
               system:

     

       353
       353
       +
       

     

       354
       354
       +
               with import ./.. { inherit system; };

     

       355
       355
       +
       

     

       356
       356
       +
               hydraJob (

     

       357
       357
       +
                 (import lib/eval-config.nix {

     

       358
       358
       +
                   inherit system;

     

       359
       359
       +
                   modules = [

     

       360
       360
       +
                     configuration

     

       361
       361
       +
                     versionModule

     

       362
       362
       +
                     ./maintainers/scripts/incus/incus-container-image.nix

     

       363
       363
       +
                   ];

     

       364
       364
       +
                 }).config.system.build.metadata

     

       365
       365
       +
               )

     

       366
       366
       +
             );

     

       367
       367
       +
       

     

       368
       368
       +
         # An image that can be imported into incus and used for container creation

     

       369
       369
       +
         incusVirtualMachineImage =

     

       370
       370
       +
           forMatchingSystems

     

       371
       371
       +
             [

     

       372
       372
       +
               "x86_64-linux"

     

       373
       373
       +
               "aarch64-linux"

     

       374
       374
       +
             ]

     

       375
       375
       +
             (

     

       376
       376
       +
               system:

     

       377
       377
       +
       

     

       378
       378
       +
               with import ./.. { inherit system; };

     

       379
       379
       +
       

     

       380
       380
       +
               hydraJob (

     

       381
       381
       +
                 (import lib/eval-config.nix {

     

       382
       382
       +
                   inherit system;

     

       383
       383
       +
                   modules = [

     

       384
       384
       +
                     configuration

     

       385
       385
       +
                     versionModule

     

       386
       386
       +
                     ./maintainers/scripts/incus/incus-virtual-machine-image.nix

     

       387
       387
       +
                   ];

     

       388
       388
       +
                 }).config.system.build.qemuImage

     

       389
       389
       +
               )

     

       390
       390
       +
             );

     

       391
       391
       +
       

     

       392
       392
       +
         # Metadata for the incus image

     

       393
       393
       +
         incusVirtualMachineImageMeta =

     

       394
       394
       +
           forMatchingSystems

     

       395
       395
       +
             [

     

       396
       396
       +
               "x86_64-linux"

     

       397
       397
       +
               "aarch64-linux"

     

       398
       398
       +
             ]

     

       399
       399
       +
             (

     

       400
       400
       +
               system:

     

       401
       401
       +
       

     

       402
       402
       +
               with import ./.. { inherit system; };

     

       403
       403
       +
       

     

       404
       404
       +
               hydraJob (

     

       405
       405
       +
                 (import lib/eval-config.nix {

     

       406
       406
       +
                   inherit system;

     

       407
       407
       +
                   modules = [

     

       408
       408
       +
                     configuration

     

       409
       409
       +
                     versionModule

     

       410
       410
       +
                     ./maintainers/scripts/incus/incus-virtual-machine-image.nix

     

       411
       411
       +
                   ];

     

       412
       412
       +
                 }).config.system.build.metadata

     

       413
       413
       +
               )

     

       414
       414
       +
             );

     

       415
       415
       +
       

     

       321
       416
        
         # An image that can be imported into lxd and used for container creation

     

       322
       417
        
         lxdContainerImage = forMatchingSystems [ "x86_64-linux" "aarch64-linux" ] (system:

     

       323
       418

+3 -3

nixos/tests/incus/container.nix

···

       11
       11
        
           extra;

     

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
       -
         container-image-metadata = releases.lxdContainerMeta.${pkgs.stdenv.hostPlatform.system};

     

       15
       15
       -
         container-image-rootfs = releases.lxdContainerImage.${pkgs.stdenv.hostPlatform.system};

     

       14
       14
       +
         container-image-metadata = releases.incusContainerMeta.${pkgs.stdenv.hostPlatform.system};

     

       15
       15
       +
         container-image-rootfs = releases.incusContainerImage.${pkgs.stdenv.hostPlatform.system};

     

       16
       16
        
       in

     

       17
       17
        
       {

     

       18
       18
        
         inherit name;

     
···

       61
       61
        
           machine.succeed("incus admin init --minimal")

     

       62
       62
        
       

     

       63
       63
        
           with subtest("Container image can be imported"):

     

       64
       64
       -
               machine.succeed("incus image import ${container-image-metadata}/*/*.tar.xz ${container-image-rootfs}/*/*.tar.xz --alias nixos")

     

       64
       64
       +
               machine.succeed("incus image import ${container-image-metadata}/*/*.tar.xz ${container-image-rootfs} --alias nixos")

     

       65
       65
        
       

     

       66
       66
        
           with subtest("Container can be launched and managed"):

     

       67
       67
        
               machine.succeed("incus launch nixos container")

+3 -3

nixos/tests/incus/incusd-options.nix

···

       16
       16
        
             };

     

       17
       17
        
           };

     

       18
       18
        
       

     

       19
       19
       -
           container-image-metadata = releases.lxdContainerMeta.${pkgs.stdenv.hostPlatform.system};

     

       20
       20
       -
           container-image-rootfs = releases.lxdContainerImage.${pkgs.stdenv.hostPlatform.system};

     

       19
       19
       +
           container-image-metadata = releases.incusContainerMeta.${pkgs.stdenv.hostPlatform.system};

     

       20
       20
       +
           container-image-rootfs = releases.incusContainerImage.${pkgs.stdenv.hostPlatform.system};

     

       21
       21
        
         in

     

       22
       22
        
         {

     

       23
       23
        
           name = "incusd-options";

     
···

       87
       87
        
             machine.wait_for_unit("incus-preseed.service")

     

       88
       88
        
       

     

       89
       89
        
             with subtest("Container image can be imported"):

     

       90
       90
       -
                 machine.succeed("incus image import ${container-image-metadata}/*/*.tar.xz ${container-image-rootfs}/*/*.tar.xz --alias nixos")

     

       90
       90
       +
                 machine.succeed("incus image import ${container-image-metadata}/*/*.tar.xz ${container-image-rootfs} --alias nixos")

     

       91
       91
        
       

     

       92
       92
        
             with subtest("Container can be launched and managed"):

     

       93
       93
        
                 machine.succeed("incus launch nixos container")

+5 -5

nixos/tests/incus/virtual-machine.nix

···

       11
       11
        
           };

     

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
       -
         vm-image-metadata = releases.lxdVirtualMachineImageMeta.${pkgs.stdenv.hostPlatform.system};

     

       15
       15
       -
         vm-image-disk = releases.lxdVirtualMachineImage.${pkgs.stdenv.hostPlatform.system};

     

       14
       14
       +
         vm-image-metadata = releases.incusVirtualMachineImageMeta.${pkgs.stdenv.hostPlatform.system};

     

       15
       15
       +
         vm-image-disk = releases.incusVirtualMachineImage.${pkgs.stdenv.hostPlatform.system};

     

       16
       16
        
       

     

       17
       17
        
         instance-name = "instance1";

     

       18
       18
        
       in

     
···

       64
       64
        
               with machine.nested("Waiting for instance to start and be usable"):

     

       65
       65
        
                 retry(instance_is_up)

     

       66
       66
        
       

     

       67
       67
       -
           with subtest("lxd-agent is started"):

     

       68
       68
       -
               machine.succeed("incus exec ${instance-name} systemctl is-active lxd-agent")

     

       67
       67
       +
           with subtest("incus-agent is started"):

     

       68
       68
       +
               machine.succeed("incus exec ${instance-name} systemctl is-active incus-agent")

     

       69
       69
        
       

     

       70
       70
       -
           with subtest("lxd-agent has a valid path"):

     

       70
       70
       +
           with subtest("incus-agent has a valid path"):

     

       71
       71
        
               machine.succeed("incus exec ${instance-name} -- bash -c 'true'")

     

       72
       72
        
       

     

       73
       73
        
           with subtest("guest supports cpu hotplug"):