commit 9809e1575bf01f845e8ff3b76b1ac7166d2ca945 · pyrox.dev/nixpkgs

+1 -1

nixos/modules/module-list.nix

···

       1157
       1157
        
         ./system/boot/systemd-nspawn.nix

     

       1158
       1158
        
         ./system/boot/timesyncd.nix

     

       1159
       1159
        
         ./system/boot/tmp.nix

     

       1160
       1160
       -
         ./system/etc/etc.nix

     

       1160
       1160
       +
         ./system/etc/etc-activation.nix

     

       1161
       1161
        
         ./tasks/auto-upgrade.nix

     

       1162
       1162
        
         ./tasks/bcache.nix

     

       1163
       1163
        
         ./tasks/cpu-freq.nix

+12

nixos/modules/system/etc/etc-activation.nix

···

       1
       1
       +
       { config, lib, ... }:

     

       2
       2
       +
       let

     

       3
       3
       +
         inherit (lib) stringAfter;

     

       4
       4
       +
       in {

     

       5
       5
       +
       

     

       6
       6
       +
         imports = [ ./etc.nix ];

     

       7
       7
       +
       

     

       8
       8
       +
         config = {

     

       9
       9
       +
           system.activationScripts.etc =

     

       10
       10
       +
             stringAfter [ "users" "groups" ] config.system.build.etcActivationCommands;

     

       11
       11
       +
         };

     

       12
       12
       +
       }

+3 -3

nixos/modules/system/etc/etc.nix

···

       66
       66
        
       

     

       67
       67
        
       {

     

       68
       68
        
       

     

       69
       69
       +
         imports = [ ../build.nix ];

     

       70
       70
       +
       

     

       69
       71
        
         ###### interface

     

       70
       72
        
       

     

       71
       73
        
         options = {

     
···

       188
       190
        
         config = {

     

       189
       191
        
       

     

       190
       192
        
           system.build.etc = etc;

     

       191
       191
       -
       

     

       192
       192
       -
           system.activationScripts.etc = stringAfter [ "users" "groups" ]

     

       193
       193
       +
           system.build.etcActivationCommands =

     

       193
       194
        
             ''

     

       194
       195
        
               # Set up the statically computed bits of /etc.

     

       195
       196
        
               echo "setting up /etc..."

     

       196
       197
        
               ${pkgs.perl.withPackages (p: [ p.FileSlurp ])}/bin/perl ${./setup-etc.pl} ${etc}/etc

     

       197
       198
        
             '';

     

       198
       198
       -
       

     

       199
       199
        
         };

     

       200
       200
        
       

     

       201
       201
        
       }

+70

nixos/modules/system/etc/test.nix

···

       1
       1
       +
       { lib

     

       2
       2
       +
       , coreutils

     

       3
       3
       +
       , fakechroot

     

       4
       4
       +
       , fakeroot

     

       5
       5
       +
       , evalMinimalConfig

     

       6
       6
       +
       , pkgsModule

     

       7
       7
       +
       , runCommand

     

       8
       8
       +
       , util-linux

     

       9
       9
       +
       , vmTools

     

       10
       10
       +
       , writeText

     

       11
       11
       +
       }:

     

       12
       12
       +
       let

     

       13
       13
       +
         node = evalMinimalConfig ({ config, ... }: {

     

       14
       14
       +
           imports = [ pkgsModule ../etc/etc.nix ];

     

       15
       15
       +
           environment.etc."passwd" = {

     

       16
       16
       +
             text = passwdText;

     

       17
       17
       +
           };

     

       18
       18
       +
           environment.etc."hosts" = {

     

       19
       19
       +
             text = hostsText;

     

       20
       20
       +
             mode = "0751";

     

       21
       21
       +
           };

     

       22
       22
       +
         });

     

       23
       23
       +
         passwdText = ''

     

       24
       24
       +
           root:x:0:0:System administrator:/root:/run/current-system/sw/bin/bash

     

       25
       25
       +
         '';

     

       26
       26
       +
         hostsText = ''

     

       27
       27
       +
           127.0.0.1 localhost

     

       28
       28
       +
           ::1 localhost

     

       29
       29
       +
           # testing...

     

       30
       30
       +
         '';

     

       31
       31
       +
       in

     

       32
       32
       +
       lib.recurseIntoAttrs {

     

       33
       33
       +
         test-etc-vm =

     

       34
       34
       +
           vmTools.runInLinuxVM (runCommand "test-etc-vm" { } ''

     

       35
       35
       +
             mkdir -p /etc

     

       36
       36
       +
             ${node.config.system.build.etcActivationCommands}

     

       37
       37
       +
             set -x

     

       38
       38
       +
             [[ -L /etc/passwd ]]

     

       39
       39
       +
             diff /etc/passwd ${writeText "expected-passwd" passwdText}

     

       40
       40
       +
             [[ 751 = $(stat --format %a /etc/hosts) ]]

     

       41
       41
       +
             diff /etc/hosts ${writeText "expected-hosts" hostsText}

     

       42
       42
       +
             set +x

     

       43
       43
       +
             touch $out

     

       44
       44
       +
           '');

     

       45
       45
       +
       

     

       46
       46
       +
         # fakeroot is behaving weird

     

       47
       47
       +
         test-etc-fakeroot =

     

       48
       48
       +
           runCommand "test-etc"

     

       49
       49
       +
             {

     

       50
       50
       +
               nativeBuildInputs = [

     

       51
       51
       +
                 fakeroot

     

       52
       52
       +
                 fakechroot

     

       53
       53
       +
                 # for chroot

     

       54
       54
       +
                 coreutils

     

       55
       55
       +
                 # fakechroot needs getopt, which is provided by util-linux

     

       56
       56
       +
                 util-linux

     

       57
       57
       +
               ];

     

       58
       58
       +
               fakeRootCommands = ''

     

       59
       59
       +
                 mkdir -p /etc

     

       60
       60
       +
                 ${node.config.system.build.etcActivationCommands}

     

       61
       61
       +
                 diff /etc/hosts ${writeText "expected-hosts" hostsText}

     

       62
       62
       +
                 touch $out

     

       63
       63
       +
               '';

     

       64
       64
       +
             } ''

     

       65
       65
       +
             mkdir fake-root

     

       66
       66
       +
             export FAKECHROOT_EXCLUDE_PATH=/dev:/proc:/sys:${builtins.storeDir}:$out

     

       67
       67
       +
             fakechroot fakeroot chroot $PWD/fake-root bash -c 'source $stdenv/setup; eval "$fakeRootCommands"'

     

       68
       68
       +
           '';

     

       69
       69
       +
       

     

       70
       70
       +
       }

nixos/tests/all-tests.nix

···

       140
       140
        
         env = handleTest ./env.nix {};

     

       141
       141
        
         ergo = handleTest ./ergo.nix {};

     

       142
       142
        
         ergochat = handleTest ./ergochat.nix {};

     

       143
       143
       +
         etc = pkgs.callPackage ../modules/system/etc/test.nix { inherit evalMinimalConfig; };

     

       143
       144
        
         etcd = handleTestOn ["x86_64-linux"] ./etcd.nix {};

     

       144
       145
        
         etcd-cluster = handleTestOn ["x86_64-linux"] ./etcd-cluster.nix {};

     

       145
       146
        
         etebase-server = handleTest ./etebase-server.nix {};