commit 06ad3811a856a1769e35eecfd2c2d56aebf0ae6a · pyrox.dev/nixpkgs

+89 -69

nixos/modules/virtualisation/lxc-container.nix

···

       1
       1
       -
       { lib, config, pkgs, ... }:

     

       1
       1
       +
       {

     

       2
       2
       +
         lib,

     

       3
       3
       +
         config,

     

       4
       4
       +
         pkgs,

     

       5
       5
       +
         ...

     

       6
       6
       +
       }:

     

       2
       7
        
       

     

       3
       8
        
       {

     

       4
       9
        
         meta = {

     
···

       8
       13
        
         imports = [

     

       9
       14
        
           ./lxc-instance-common.nix

     

       10
       15
        
       

     

       11
       11
       -
           (lib.mkRemovedOptionModule [ "virtualisation" "lxc" "nestedContainer" ] "")

     

       12
       12
       -
           (lib.mkRemovedOptionModule [ "virtualisation" "lxc" "privilegedContainer" ] "")

     

       16
       16
       +
           (lib.mkRemovedOptionModule [

     

       17
       17
       +
             "virtualisation"

     

       18
       18
       +
             "lxc"

     

       19
       19
       +
             "nestedContainer"

     

       20
       20
       +
           ] "")

     

       21
       21
       +
           (lib.mkRemovedOptionModule [

     

       22
       22
       +
             "virtualisation"

     

       23
       23
       +
             "lxc"

     

       24
       24
       +
             "privilegedContainer"

     

       25
       25
       +
           ] "")

     

       13
       26
        
         ];

     

       14
       27
        
       

     

       15
       28
        
         options = { };

     

       16
       29
        
       

     

       17
       17
       -
         config = let

     

       18
       18
       -
           initScript = if config.boot.initrd.systemd.enable then "prepare-root" else "init";

     

       19
       19
       -
         in {

     

       20
       20
       -
           boot.isContainer = true;

     

       21
       21
       -
           boot.postBootCommands =

     

       22
       22
       -
             ''

     

       30
       30
       +
         config =

     

       31
       31
       +
           let

     

       32
       32
       +
             initScript = if config.boot.initrd.systemd.enable then "prepare-root" else "init";

     

       33
       33
       +
           in

     

       34
       34
       +
           {

     

       35
       35
       +
             boot.isContainer = true;

     

       36
       36
       +
             boot.postBootCommands = ''

     

       23
       37
        
               # After booting, register the contents of the Nix store in the Nix

     

       24
       38
        
               # database.

     

       25
       39
        
               if [ -f /nix-path-registration ]; then

     
···

       31
       45
        
               ${config.nix.package.out}/bin/nix-env -p /nix/var/nix/profiles/system --set /run/current-system

     

       32
       46
        
             '';

     

       33
       47
        
       

     

       34
       34
       -
           # supplement 99-ethernet-default-dhcp which excludes veth

     

       35
       35
       -
           systemd.network = lib.mkIf config.networking.useDHCP {

     

       36
       36
       -
             networks."99-lxc-veth-default-dhcp" = {

     

       37
       37
       -
               matchConfig = {

     

       38
       38
       -
                 Type = "ether";

     

       39
       39
       -
                 Kind = "veth";

     

       40
       40
       -
                 Name = [

     

       41
       41
       -
                   "en*"

     

       42
       42
       -
                   "eth*"

     

       43
       43
       -
                 ];

     

       48
       48
       +
             # supplement 99-ethernet-default-dhcp which excludes veth

     

       49
       49
       +
             systemd.network = lib.mkIf config.networking.useDHCP {

     

       50
       50
       +
               networks."99-lxc-veth-default-dhcp" = {

     

       51
       51
       +
                 matchConfig = {

     

       52
       52
       +
                   Type = "ether";

     

       53
       53
       +
                   Kind = "veth";

     

       54
       54
       +
                   Name = [

     

       55
       55
       +
                     "en*"

     

       56
       56
       +
                     "eth*"

     

       57
       57
       +
                   ];

     

       58
       58
       +
                 };

     

       59
       59
       +
                 DHCP = "yes";

     

       60
       60
       +
                 networkConfig.IPv6PrivacyExtensions = "kernel";

     

       44
       61
        
               };

     

       45
       45
       -
               DHCP = "yes";

     

       46
       46
       -
               networkConfig.IPv6PrivacyExtensions = "kernel";

     

       47
       62
        
             };

     

       48
       48
       -
           };

     

       49
       63
        
       

     

       50
       50
       -
           system.build.tarball = pkgs.callPackage ../../lib/make-system-tarball.nix {

     

       51
       51
       -
             extraArgs = "--owner=0";

     

       64
       64
       +
             system.nixos.tags = lib.mkOverride 99 [ "lxc" ];

     

       65
       65
       +
             image.extension = "tar.xz";

     

       66
       66
       +
             image.filePath = "tarball/${config.image.fileName}";

     

       67
       67
       +
             system.build.image = lib.mkOverride 99 config.system.build.tarball;

     

       52
       68
        
       

     

       53
       53
       -
             storeContents = [

     

       54
       54
       -
               {

     

       55
       55
       -
                 object = config.system.build.toplevel;

     

       56
       56
       -
                 symlink = "none";

     

       57
       57
       -
               }

     

       58
       58
       -
             ];

     

       69
       69
       +
             system.build.tarball = pkgs.callPackage ../../lib/make-system-tarball.nix {

     

       70
       70
       +
               fileName = config.image.baseName;

     

       71
       71
       +
               extraArgs = "--owner=0";

     

       59
       72
        
       

     

       60
       60
       -
             contents = [

     

       61
       61
       -
               {

     

       62
       62
       -
                 source = config.system.build.toplevel + "/${initScript}";

     

       63
       63
       -
                 target = "/sbin/init";

     

       64
       64
       -
               }

     

       65
       65
       -
               # Technically this is not required for lxc, but having also make this configuration work with systemd-nspawn.

     

       66
       66
       -
               # Nixos will setup the same symlink after start.

     

       67
       67
       -
               {

     

       68
       68
       -
                 source = config.system.build.toplevel + "/etc/os-release";

     

       69
       69
       -
                 target = "/etc/os-release";

     

       70
       70
       -
               }

     

       71
       71
       -
             ];

     

       73
       73
       +
               storeContents = [

     

       74
       74
       +
                 {

     

       75
       75
       +
                   object = config.system.build.toplevel;

     

       76
       76
       +
                   symlink = "none";

     

       77
       77
       +
                 }

     

       78
       78
       +
               ];

     

       72
       79
        
       

     

       73
       73
       -
             extraCommands = "mkdir -p proc sys dev";

     

       74
       74
       -
           };

     

       80
       80
       +
               contents = [

     

       81
       81
       +
                 {

     

       82
       82
       +
                   source = config.system.build.toplevel + "/${initScript}";

     

       83
       83
       +
                   target = "/sbin/init";

     

       84
       84
       +
                 }

     

       85
       85
       +
                 # Technically this is not required for lxc, but having also make this configuration work with systemd-nspawn.

     

       86
       86
       +
                 # Nixos will setup the same symlink after start.

     

       87
       87
       +
                 {

     

       88
       88
       +
                   source = config.system.build.toplevel + "/etc/os-release";

     

       89
       89
       +
                   target = "/etc/os-release";

     

       90
       90
       +
                 }

     

       91
       91
       +
               ];

     

       75
       92
        
       

     

       76
       76
       -
           system.build.squashfs = pkgs.callPackage ../../lib/make-squashfs.nix {

     

       77
       77
       -
             fileName = "nixos-lxc-image-${pkgs.stdenv.hostPlatform.system}";

     

       93
       93
       +
               extraCommands = "mkdir -p proc sys dev";

     

       94
       94
       +
             };

     

       78
       95
        
       

     

       79
       79
       -
             hydraBuildProduct = true;

     

       80
       80
       -
             noStrip = true; # keep directory structure

     

       81
       81
       -
             comp = "zstd -Xcompression-level 6";

     

       96
       96
       +
             system.build.squashfs = pkgs.callPackage ../../lib/make-squashfs.nix {

     

       97
       97
       +
               fileName = "nixos-lxc-image-${pkgs.stdenv.hostPlatform.system}";

     

       82
       98
        
       

     

       83
       83
       -
             storeContents = [config.system.build.toplevel];

     

       99
       99
       +
               hydraBuildProduct = true;

     

       100
       100
       +
               noStrip = true; # keep directory structure

     

       101
       101
       +
               comp = "zstd -Xcompression-level 6";

     

       102
       102
       +
       

     

       103
       103
       +
               storeContents = [ config.system.build.toplevel ];

     

       84
       104
        
       

     

       85
       85
       -
             pseudoFiles = [

     

       86
       86
       -
               "/sbin d 0755 0 0"

     

       87
       87
       -
               "/sbin/init s 0555 0 0 ${config.system.build.toplevel}/${initScript}"

     

       88
       88
       -
               "/dev d 0755 0 0"

     

       89
       89
       -
               "/proc d 0555 0 0"

     

       90
       90
       -
               "/sys d 0555 0 0"

     

       91
       91
       -
             ];

     

       92
       92
       -
           };

     

       105
       105
       +
               pseudoFiles = [

     

       106
       106
       +
                 "/sbin d 0755 0 0"

     

       107
       107
       +
                 "/sbin/init s 0555 0 0 ${config.system.build.toplevel}/${initScript}"

     

       108
       108
       +
                 "/dev d 0755 0 0"

     

       109
       109
       +
                 "/proc d 0555 0 0"

     

       110
       110
       +
                 "/sys d 0555 0 0"

     

       111
       111
       +
               ];

     

       112
       112
       +
             };

     

       93
       113
        
       

     

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

     

       95
       95
       -
             #!${pkgs.runtimeShell}

     

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

     

       97
       97
       -
           '';

     

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

     

       115
       115
       +
               #!${pkgs.runtimeShell}

     

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

     

       117
       117
       +
             '';

     

       98
       118
        
       

     

       99
       99
       -
           # networkd depends on this, but systemd module disables this for containers

     

       100
       100
       -
           systemd.additionalUpstreamSystemUnits = ["systemd-udev-trigger.service"];

     

       119
       119
       +
             # networkd depends on this, but systemd module disables this for containers

     

       120
       120
       +
             systemd.additionalUpstreamSystemUnits = [ "systemd-udev-trigger.service" ];

     

       101
       121
        
       

     

       102
       102
       -
           systemd.packages = [ pkgs.distrobuilder.generator ];

     

       122
       122
       +
             systemd.packages = [ pkgs.distrobuilder.generator ];

     

       103
       123
        
       

     

       104
       104
       -
           system.activationScripts.installInitScript = lib.mkForce ''

     

       105
       105
       -
             ln -fs $systemConfig/${initScript} /sbin/init

     

       106
       106
       -
           '';

     

       107
       107
       -
         };

     

       124
       124
       +
             system.activationScripts.installInitScript = lib.mkForce ''

     

       125
       125
       +
               ln -fs $systemConfig/${initScript} /sbin/init

     

       126
       126
       +
             '';

     

       127
       127
       +
           };

     

       108
       128
        
       }

nixos/modules/virtualisation/lxc-image-metadata.nix

···

       46
       46
        
         else { files = []; properties = {}; };

     

       47
       47
        
       

     

       48
       48
        
       in {

     

       49
       49
       +
         imports = [

     

       50
       50
       +
           ../image/file-options.nix

     

       51
       51
       +
         ];

     

       52
       52
       +
       

     

       49
       53
        
         meta = {

     

       50
       54
        
           maintainers = lib.teams.lxc.members;

     

       51
       55
        
         };

     
···

       87
       91
        
         };

     

       88
       92
        
       

     

       89
       93
        
         config = {

     

       94
       94
       +
           system.nixos.tags = [ "lxc" "metadata" ];

     

       95
       95
       +
           image.extension = "tar.xz";

     

       96
       96
       +
           image.filePath = "tarball/${config.image.fileName}";

     

       97
       97
       +
           system.build.image = config.system.build.metadata;

     

       90
       98
        
           system.build.metadata = pkgs.callPackage ../../lib/make-system-tarball.nix {

     

       99
       99
       +
             fileName = config.image.baseName;

     

       91
       100
        
             contents = [

     

       92
       101
        
               {

     

       93
       102
        
                 source = toYAML "metadata.yaml" {