diff options
author | Robert Hensing <robert@roberthensing.nl> | 2021-12-03 12:21:16 +0000 |
---|---|---|
committer | Robert Hensing <robert@roberthensing.nl> | 2022-01-30 09:01:27 +0100 |
commit | 9809e1575bf01f845e8ff3b76b1ac7166d2ca945 (patch) | |
tree | f02905e7964adaa6fab6f7b05e306112ebaccc59 /nixos/modules/system | |
parent | 270426ab6e55cbd07ac0e3c07ae693dbaaa1fd3a (diff) | |
download | nixpkgs-9809e1575bf01f845e8ff3b76b1ac7166d2ca945.tar nixpkgs-9809e1575bf01f845e8ff3b76b1ac7166d2ca945.tar.gz nixpkgs-9809e1575bf01f845e8ff3b76b1ac7166d2ca945.tar.bz2 nixpkgs-9809e1575bf01f845e8ff3b76b1ac7166d2ca945.tar.lz nixpkgs-9809e1575bf01f845e8ff3b76b1ac7166d2ca945.tar.xz nixpkgs-9809e1575bf01f845e8ff3b76b1ac7166d2ca945.tar.zst nixpkgs-9809e1575bf01f845e8ff3b76b1ac7166d2ca945.zip |
nixos/etc.nix: Make independent
(cherry picked from commit 56c283e5c8dfd4d8d5daa15dfa3896beef2ac012)
Diffstat (limited to 'nixos/modules/system')
-rw-r--r-- | nixos/modules/system/etc/etc-activation.nix | 12 | ||||
-rw-r--r-- | nixos/modules/system/etc/etc.nix | 6 | ||||
-rw-r--r-- | nixos/modules/system/etc/test.nix | 70 |
3 files changed, 85 insertions, 3 deletions
diff --git a/nixos/modules/system/etc/etc-activation.nix b/nixos/modules/system/etc/etc-activation.nix new file mode 100644 index 00000000000..78010495018 --- /dev/null +++ b/nixos/modules/system/etc/etc-activation.nix @@ -0,0 +1,12 @@ +{ config, lib, ... }: +let + inherit (lib) stringAfter; +in { + + imports = [ ./etc.nix ]; + + config = { + system.activationScripts.etc = + stringAfter [ "users" "groups" ] config.system.build.etcActivationCommands; + }; +} diff --git a/nixos/modules/system/etc/etc.nix b/nixos/modules/system/etc/etc.nix index 6cc8c341e6d..ed552fecec5 100644 --- a/nixos/modules/system/etc/etc.nix +++ b/nixos/modules/system/etc/etc.nix @@ -66,6 +66,8 @@ in { + imports = [ ../build.nix ]; + ###### interface options = { @@ -188,14 +190,12 @@ in config = { system.build.etc = etc; - - system.activationScripts.etc = stringAfter [ "users" "groups" ] + system.build.etcActivationCommands = '' # Set up the statically computed bits of /etc. echo "setting up /etc..." ${pkgs.perl.withPackages (p: [ p.FileSlurp ])}/bin/perl ${./setup-etc.pl} ${etc}/etc ''; - }; } diff --git a/nixos/modules/system/etc/test.nix b/nixos/modules/system/etc/test.nix new file mode 100644 index 00000000000..5e43b155038 --- /dev/null +++ b/nixos/modules/system/etc/test.nix @@ -0,0 +1,70 @@ +{ lib +, coreutils +, fakechroot +, fakeroot +, evalMinimalConfig +, pkgsModule +, runCommand +, util-linux +, vmTools +, writeText +}: +let + node = evalMinimalConfig ({ config, ... }: { + imports = [ pkgsModule ../etc/etc.nix ]; + environment.etc."passwd" = { + text = passwdText; + }; + environment.etc."hosts" = { + text = hostsText; + mode = "0751"; + }; + }); + passwdText = '' + root:x:0:0:System administrator:/root:/run/current-system/sw/bin/bash + ''; + hostsText = '' + 127.0.0.1 localhost + ::1 localhost + # testing... + ''; +in +lib.recurseIntoAttrs { + test-etc-vm = + vmTools.runInLinuxVM (runCommand "test-etc-vm" { } '' + mkdir -p /etc + ${node.config.system.build.etcActivationCommands} + set -x + [[ -L /etc/passwd ]] + diff /etc/passwd ${writeText "expected-passwd" passwdText} + [[ 751 = $(stat --format %a /etc/hosts) ]] + diff /etc/hosts ${writeText "expected-hosts" hostsText} + set +x + touch $out + ''); + + # fakeroot is behaving weird + test-etc-fakeroot = + runCommand "test-etc" + { + nativeBuildInputs = [ + fakeroot + fakechroot + # for chroot + coreutils + # fakechroot needs getopt, which is provided by util-linux + util-linux + ]; + fakeRootCommands = '' + mkdir -p /etc + ${node.config.system.build.etcActivationCommands} + diff /etc/hosts ${writeText "expected-hosts" hostsText} + touch $out + ''; + } '' + mkdir fake-root + export FAKECHROOT_EXCLUDE_PATH=/dev:/proc:/sys:${builtins.storeDir}:$out + fakechroot fakeroot chroot $PWD/fake-root bash -c 'source $stdenv/setup; eval "$fakeRootCommands"' + ''; + +} |