commit 522c16bd8669dd2d71fd4c01b2b2fe02a0a7a02c · pyrox.dev/nixpkgs

+13 -12
nixos/modules/system/boot/systemd-nspawn.nix
···

       42
       42
        
         ];

     

       43
       43
        
       

     

       44
       44
        
         instanceOptions = {

     

       45
       45
       -
           options = {

     

       46
       46
       -
       

     

       45
       45
       +
           options = sharedOptions // {

     

       47
       46
        
             execConfig = mkOption {

     

       48
       47
        
               default = {};

     

       49
       48
        
               example = { Parameters = "/bin/sh"; };

     
···

       84
       83
        
         };

     

       85
       84
        
       

     

       86
       85
        
         instanceToUnit = name: def:

     

       87
       87
       -
           { text = ''

     

       88
       88
       -
             [Exec]

     

       89
       89
       -
             ${attrsToSection def.execConfig}

     

       86
       86
       +
           let base = {

     

       87
       87
       +
             text = ''

     

       88
       88
       +
               [Exec]

     

       89
       89
       +
               ${attrsToSection def.execConfig}

     

       90
       90
        
       

     

       91
       91
       -
             [Files]

     

       92
       92
       -
             ${attrsToSection def.filesConfig}

     

       91
       91
       +
               [Files]

     

       92
       92
       +
               ${attrsToSection def.filesConfig}

     

       93
       93
        
       

     

       94
       94
       -
             [Network]

     

       95
       95
       -
             ${attrsToSection def.networkConfig}

     

       96
       96
       -
           '';

     

       97
       97
       -
           };

     

       94
       94
       +
               [Network]

     

       95
       95
       +
               ${attrsToSection def.networkConfig}

     

       96
       96
       +
             '';

     

       97
       97
       +
           } // def;

     

       98
       98
       +
           in base // { unit = makeUnit name base; };

     

       98
       99
        
       

     

       99
       100
        
       in {

     

       100
       101
        
       

     
···

       110
       111
        
       

     

       111
       112
        
         config =

     

       112
       113
        
           let

     

       113
       113
       -
             units = mapAttrs' (n: v: nameValuePair "${n}.nspawn" (instanceToUnit n v)) cfg.instances;

     

       114
       114
       +
             units = mapAttrs' (n: v: nameValuePair "${n}.nspawn" (instanceToUnit n v)) cfg;

     

       114
       115
        
           in mkIf (cfg != {}) {

     

       115
       116
        
       

     

       116
       117
        
             environment.etc."systemd/nspawn".source = generateUnits "nspawn" units [] [];