diff options
| author | Janne Heß <janne@hess.ooo> | 2022-04-03 18:22:54 +0100 |
|---|---|---|
| committer | Janne Heß <janne@hess.ooo> | 2022-04-03 19:03:16 +0100 |
| commit | 56b465390449926626d3378e05b8e507061cd828 (patch) | |
| tree | 9a86ddf59782c99a750254f8be02a3f8a27a5d9e /nixos/modules | |
| parent | 4e9f1e537ed673b53b5a3e7d9e3601c9c84961eb (diff) | |
| download | nixpkgs-56b465390449926626d3378e05b8e507061cd828.tar nixpkgs-56b465390449926626d3378e05b8e507061cd828.tar.gz nixpkgs-56b465390449926626d3378e05b8e507061cd828.tar.bz2 nixpkgs-56b465390449926626d3378e05b8e507061cd828.tar.lz nixpkgs-56b465390449926626d3378e05b8e507061cd828.tar.xz nixpkgs-56b465390449926626d3378e05b8e507061cd828.tar.zst nixpkgs-56b465390449926626d3378e05b8e507061cd828.zip | |
nixos/stage-2-init: Re-add creation of /etc
Diffstat (limited to 'nixos/modules')
| -rwxr-xr-x | nixos/modules/system/boot/stage-2-init.sh | 5 | ||||
| -rw-r--r-- | nixos/modules/system/boot/systemd/tmpfiles.nix | 1 |
2 files changed, 5 insertions, 1 deletions
diff --git a/nixos/modules/system/boot/stage-2-init.sh b/nixos/modules/system/boot/stage-2-init.sh index 9f8d86da6b0..096a051f868 100755 --- a/nixos/modules/system/boot/stage-2-init.sh +++ b/nixos/modules/system/boot/stage-2-init.sh @@ -89,6 +89,11 @@ else fi +# Required by the activation script +install -m 0755 -d /etc /etc/nixos +install -m 01777 -d /tmp + + # Run the script that performs all configuration activation that does # not have to be done at boot time. echo "running activation script..." diff --git a/nixos/modules/system/boot/systemd/tmpfiles.nix b/nixos/modules/system/boot/systemd/tmpfiles.nix index edbe5996556..97d60e9d652 100644 --- a/nixos/modules/system/boot/systemd/tmpfiles.nix +++ b/nixos/modules/system/boot/systemd/tmpfiles.nix @@ -102,7 +102,6 @@ in ]; systemd.tmpfiles.rules = [ - "d /etc/nixos 0755 root root - -" "d /nix/var 0755 root root - -" "L+ /nix/var/nix/gcroots/booted-system 0755 root root - /run/booted-system" "d /run/lock 0755 root root - -" |