commit eec71f9dee36802f8f5e93c29621ef935231317c · pyrox.dev/nixpkgs

+24 -11

nixos/lib/systemd-lib.nix

···

       187
       187
        
               done

     

       188
       188
        
             done

     

       189
       189
        
       

     

       190
       190
       -
             # Symlink all units defined by systemd.units. If these are also

     

       191
       191
       -
             # provided by systemd or systemd.packages, then add them as

     

       190
       190
       +
             # Symlink units defined by systemd.units where override strategy

     

       191
       191
       +
             # shall be automatically detected. If these are also provided by

     

       192
       192
       +
             # systemd or systemd.packages, then add them as

     

       192
       193
        
             # <unit-name>.d/overrides.conf, which makes them extend the

     

       193
       194
        
             # upstream unit.

     

       194
       194
       -
             for i in ${toString (mapAttrsToList (n: v: v.unit) units)}; do

     

       195
       195
       +
             for i in ${toString (mapAttrsToList

     

       196
       196
       +
                 (n: v: v.unit)

     

       197
       197
       +
                 (lib.filterAttrs (n: v: (attrByPath [ "overrideStrategy" ] "asDropinIfExists" v) == "asDropinIfExists") units))}; do

     

       195
       198
        
               fn=$(basename $i/*)

     

       196
       199
        
               if [ -e $out/$fn ]; then

     

       197
       200
        
                 if [ "$(readlink -f $i/$fn)" = /dev/null ]; then

     
···

       208
       211
        
              else

     

       209
       212
        
                 ln -fs $i/$fn $out/

     

       210
       213
        
               fi

     

       214
       214
       +
             done

     

       215
       215
       +
       

     

       216
       216
       +
             # Symlink units defined by systemd.units which shall be

     

       217
       217
       +
             # treated as drop-in file.

     

       218
       218
       +
             for i in ${toString (mapAttrsToList

     

       219
       219
       +
                 (n: v: v.unit)

     

       220
       220
       +
                 (lib.filterAttrs (n: v: v ? overrideStrategy && v.overrideStrategy == "asDropin") units))}; do

     

       221
       221
       +
               fn=$(basename $i/*)

     

       222
       222
       +
               mkdir -p $out/$fn.d

     

       223
       223
       +
               ln -s $i/$fn $out/$fn.d/overrides.conf

     

       211
       224
        
             done

     

       212
       225
        
       

     

       213
       226
        
             # Create service aliases from aliases option.

     
···

       340
       353
        
           '';

     

       341
       354
        
       

     

       342
       355
        
         targetToUnit = name: def:

     

       343
       343
       -
           { inherit (def) aliases wantedBy requiredBy enable;

     

       356
       356
       +
           { inherit (def) aliases wantedBy requiredBy enable overrideStrategy;

     

       344
       357
        
             text =

     

       345
       358
        
               ''

     

       346
       359
        
                 [Unit]

     
···

       349
       362
        
           };

     

       350
       363
        
       

     

       351
       364
        
         serviceToUnit = name: def:

     

       352
       352
       -
           { inherit (def) aliases wantedBy requiredBy enable;

     

       365
       365
       +
           { inherit (def) aliases wantedBy requiredBy enable overrideStrategy;

     

       353
       366
        
             text = commonUnitText def +

     

       354
       367
        
               ''

     

       355
       368
        
                 [Service]

     
···

       371
       384
        
           };

     

       372
       385
        
       

     

       373
       386
        
         socketToUnit = name: def:

     

       374
       374
       -
           { inherit (def) aliases wantedBy requiredBy enable;

     

       387
       387
       +
           { inherit (def) aliases wantedBy requiredBy enable overrideStrategy;

     

       375
       388
        
             text = commonUnitText def +

     

       376
       389
        
               ''

     

       377
       390
        
                 [Socket]

     
···

       382
       395
        
           };

     

       383
       396
        
       

     

       384
       397
        
         timerToUnit = name: def:

     

       385
       385
       -
           { inherit (def) aliases wantedBy requiredBy enable;

     

       398
       398
       +
           { inherit (def) aliases wantedBy requiredBy enable overrideStrategy;

     

       386
       399
        
             text = commonUnitText def +

     

       387
       400
        
               ''

     

       388
       401
        
                 [Timer]

     
···

       391
       404
        
           };

     

       392
       405
        
       

     

       393
       406
        
         pathToUnit = name: def:

     

       394
       394
       -
           { inherit (def) aliases wantedBy requiredBy enable;

     

       407
       407
       +
           { inherit (def) aliases wantedBy requiredBy enable overrideStrategy;

     

       395
       408
        
             text = commonUnitText def +

     

       396
       409
        
               ''

     

       397
       410
        
                 [Path]

     
···

       400
       413
        
           };

     

       401
       414
        
       

     

       402
       415
        
         mountToUnit = name: def:

     

       403
       403
       -
           { inherit (def) aliases wantedBy requiredBy enable;

     

       416
       416
       +
           { inherit (def) aliases wantedBy requiredBy enable overrideStrategy;

     

       404
       417
        
             text = commonUnitText def +

     

       405
       418
        
               ''

     

       406
       419
        
                 [Mount]

     
···

       409
       422
        
           };

     

       410
       423
        
       

     

       411
       424
        
         automountToUnit = name: def:

     

       412
       412
       -
           { inherit (def) aliases wantedBy requiredBy enable;

     

       425
       425
       +
           { inherit (def) aliases wantedBy requiredBy enable overrideStrategy;

     

       413
       426
        
             text = commonUnitText def +

     

       414
       427
        
               ''

     

       415
       428
        
                 [Automount]

     
···

       418
       431
        
           };

     

       419
       432
        
       

     

       420
       433
        
         sliceToUnit = name: def:

     

       421
       421
       -
           { inherit (def) aliases wantedBy requiredBy enable;

     

       434
       434
       +
           { inherit (def) aliases wantedBy requiredBy enable overrideStrategy;

     

       422
       435
        
             text = commonUnitText def +

     

       423
       436
        
               ''

     

       424
       437
        
                 [Slice]

+16

nixos/lib/systemd-unit-options.nix

···

       48
       48
        
             '';

     

       49
       49
        
           };

     

       50
       50
        
       

     

       51
       51
       +
           overrideStrategy = mkOption {

     

       52
       52
       +
             default = "asDropinIfExists";

     

       53
       53
       +
             type = types.enum [ "asDropinIfExists" "asDropin" ];

     

       54
       54
       +
             description = lib.mdDoc ''

     

       55
       55
       +
               Defines how unit configuration is provided for systemd:

     

       56
       56
       +
       

     

       57
       57
       +
               `asDropinIfExists` creates a unit file when no unit file is provided by the package

     

       58
       58
       +
               otherwise a drop-in file name `overrides.conf`.

     

       59
       59
       +
       

     

       60
       60
       +
               `asDropin` creates a drop-in file named `overrides.conf`.

     

       61
       61
       +
               Mainly needed to define instances for systemd template units (e.g. `systemd-nspawn@mycontainer.service`).

     

       62
       62
       +
       

     

       63
       63
       +
               See also systemd.unit(1).

     

       64
       64
       +
             '';

     

       65
       65
       +
           };

     

       66
       66
       +
       

     

       51
       67
        
           requiredBy = mkOption {

     

       52
       68
        
             default = [];

     

       53
       69
        
             type = types.listOf unitNameType;

+11

nixos/tests/systemd-machinectl.nix

···

       44
       44
        
       

     

       45
       45
        
             # not needed, but we want to test the nspawn file generation

     

       46
       46
        
             systemd.nspawn.${containerName} = { };

     

       47
       47
       +
       

     

       48
       48
       +
             systemd.services."systemd-nspawn@${containerName}" = {

     

       49
       49
       +
               serviceConfig.Environment = [

     

       50
       50
       +
                 # Disable tmpfs for /tmp

     

       51
       51
       +
                 "SYSTEMD_NSPAWN_TMPFS_TMP=0"

     

       52
       52
       +
               ];

     

       53
       53
       +
               overrideStrategy = "asDropin";

     

       54
       54
       +
             };

     

       47
       55
        
           };

     

       48
       56
        
       

     

       49
       57
        
           testScript = ''

     
···

       94
       102
        
             # Test machinectl stop

     

       95
       103
        
             machine.succeed("machinectl stop ${containerName}");

     

       96
       104
        
             machine.wait_until_succeeds("test $(systemctl is-active systemd-nspawn@${containerName}) = inactive");

     

       105
       105
       +
       

     

       106
       106
       +
             # Test tmpfs for /tmp

     

       107
       107
       +
             machine.fail("mountpoint /tmp");

     

       97
       108
        
       

     

       98
       109
        
             # Show to to delete the container

     

       99
       110
        
             machine.succeed("chattr -i ${containerRoot}/var/empty");