commit a797967cecf8414a382aaf95a96f21f6871e4a4d · pyrox.dev/nixpkgs

+20 -8

nixos/modules/virtualisation/lxc-container.nix

···

       27
       27
        
           };

     

       28
       28
        
         };

     

       29
       29
        
       

     

       30
       30
       -
         toYAML = name: attrs: pkgs.runCommandNoCC name {

     

       31
       31
       -
           preferLocalBuild = true;

     

       32
       32
       -
           json = builtins.toFile "${name}.json" (builtins.toJSON attrs);

     

       33
       33
       -
           nativeBuildInputs = [ pkgs.remarshal ];

     

       34
       34
       -
         } "json2yaml -i $json -o $out";

     

       30
       30
       +
         toYAML = name: data: pkgs.writeText name (generators.toYAML {} data);

     

       35
       31
        
       

     

       36
       32
        
         cfg = config.virtualisation.lxc;

     

       37
       33
        
         templates = if cfg.templates != {} then let

     
···

       54
       50
        
       in

     

       55
       51
        
       {

     

       56
       52
        
         imports = [

     

       57
       57
       -
           ../profiles/docker-container.nix # FIXME, shouldn't include something from profiles/

     

       53
       53
       +
           ../installer/cd-dvd/channel.nix

     

       54
       54
       +
           ../profiles/minimal.nix

     

       55
       55
       +
           ../profiles/clone-config.nix

     

       58
       56
        
         ];

     

       59
       57
        
       

     

       60
       58
        
         options = {

     
···

       94
       92
        
         };

     

       95
       93
        
       

     

       96
       94
        
         config = {

     

       95
       95
       +
           boot.isContainer = true;

     

       96
       96
       +
           boot.postBootCommands =

     

       97
       97
       +
             ''

     

       98
       98
       +
               # After booting, register the contents of the Nix store in the Nix

     

       99
       99
       +
               # database.

     

       100
       100
       +
               if [ -f /nix-path-registration ]; then

     

       101
       101
       +
                 ${config.nix.package.out}/bin/nix-store --load-db < /nix-path-registration &&

     

       102
       102
       +
                 rm /nix-path-registration

     

       103
       103
       +
               fi

     

       104
       104
       +
       

     

       105
       105
       +
               # nixos-rebuild also requires a "system" profile

     

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

     

       107
       107
       +
             '';

     

       108
       108
       +
       

     

       97
       109
        
           system.build.metadata = pkgs.callPackage ../../lib/make-system-tarball.nix {

     

       98
       110
        
             contents = [

     

       99
       111
        
               {

     
···

       112
       124
        
             ] ++ templates.files;

     

       113
       125
        
           };

     

       114
       126
        
       

     

       115
       115
       -
           system.build.tarball = mkForce (pkgs.callPackage ../../lib/make-system-tarball.nix {

     

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

     

       116
       128
        
             extraArgs = "--owner=0";

     

       117
       129
        
       

     

       118
       130
        
             storeContents = [

     
···

       130
       142
        
             ];

     

       131
       143
        
       

     

       132
       144
        
             extraCommands = "mkdir -p proc sys dev";

     

       133
       133
       -
           });

     

       145
       145
       +
           };

     

       134
       146
        
       

     

       135
       147
        
           # Add the overrides from lxd distrobuilder

     

       136
       148
        
           systemd.extraConfig = ''

+1 -1

nixos/release.nix

···

       263
       263
        
                 versionModule

     

       264
       264
        
                 ./maintainers/scripts/lxd/lxd-image.nix

     

       265
       265
        
               ];

     

       266
       266
       -
           }).config.system.build.tarball.content) # use .content because this is an override

     

       266
       266
       +
           }).config.system.build.tarball)

     

       267
       267
        
       

     

       268
       268
        
         );

     

       269
       269