commit 39b4c0d686389c2a0eeb249b5c0d6ae1626b989b · pyrox.dev/nixpkgs

+7 -5
nixos/modules/virtualisation/lxc-container.nix
···

       14
       14
        
       

     

       15
       15
        
         options = { };

     

       16
       16
        
       

     

       17
       17
       -
         config = {

     

       17
       17
       +
         config = let

     

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

     

       19
       19
       +
         in {

     

       18
       20
        
           boot.isContainer = true;

     

       19
       21
        
           boot.postBootCommands =

     

       20
       22
        
             ''

     
···

       41
       43
        
       

     

       42
       44
        
             contents = [

     

       43
       45
        
               {

     

       44
       44
       -
                 source = config.system.build.toplevel + "/init";

     

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

     

       45
       47
        
                 target = "/sbin/init";

     

       46
       48
        
               }

     

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

     
···

       65
       67
        
       

     

       66
       68
        
             pseudoFiles = [

     

       67
       69
        
               "/sbin d 0755 0 0"

     

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

     

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

     

       69
       71
        
               "/dev d 0755 0 0"

     

       70
       72
        
               "/proc d 0555 0 0"

     

       71
       73
        
               "/sys d 0555 0 0"

     
···

       74
       76
        
       

     

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

     

       76
       78
        
             #!${pkgs.runtimeShell}

     

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

     

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

     

       78
       80
        
           '';

     

       79
       81
        
       

     

       80
       82
        
           # networkd depends on this, but systemd module disables this for containers

     
···

       83
       85
        
           systemd.packages = [ pkgs.distrobuilder.generator ];

     

       84
       86
        
       

     

       85
       87
        
           system.activationScripts.installInitScript = lib.mkForce ''

     

       86
       86
       -
             ln -fs $systemConfig/init /sbin/init

     

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

     

       87
       89
        
           '';

     

       88
       90
        
         };

     

       89
       91
        
       }