diff options
| author | Nikolay Amiantov <ab@fmap.me> | 2016-09-24 13:34:28 +0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-09-24 13:34:28 +0400 |
| commit | f42e0dc9fd2f20185f0146c09f558ced55004bb5 (patch) | |
| tree | cb6e3ec5e0220f75abec248dd55ea0161d1c9fba /nixos/modules/system | |
| parent | 0d7f5117fb6ebe786ffcce0d62bd70fe37b8456a (diff) | |
| parent | 79d4636d506094eae3c5c7575a0bef817cba9bda (diff) | |
| download | nixlib-f42e0dc9fd2f20185f0146c09f558ced55004bb5.tar nixlib-f42e0dc9fd2f20185f0146c09f558ced55004bb5.tar.gz nixlib-f42e0dc9fd2f20185f0146c09f558ced55004bb5.tar.bz2 nixlib-f42e0dc9fd2f20185f0146c09f558ced55004bb5.tar.lz nixlib-f42e0dc9fd2f20185f0146c09f558ced55004bb5.tar.xz nixlib-f42e0dc9fd2f20185f0146c09f558ced55004bb5.tar.zst nixlib-f42e0dc9fd2f20185f0146c09f558ced55004bb5.zip | |
Merge pull request #18691 from abbradar/keys-fs
stage-2 init: move /run/keys mount to boot.specialFileSystems
Diffstat (limited to 'nixos/modules/system')
| -rw-r--r-- | nixos/modules/system/boot/stage-2-init.sh | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/nixos/modules/system/boot/stage-2-init.sh b/nixos/modules/system/boot/stage-2-init.sh index ae88222f2780..f827e530f877 100644 --- a/nixos/modules/system/boot/stage-2-init.sh +++ b/nixos/modules/system/boot/stage-2-init.sh @@ -111,16 +111,6 @@ rm -f /etc/{group,passwd,shadow}.lock rm -rf /nix/var/nix/gcroots/tmp /nix/var/nix/temproots -# Create a ramfs on /run/keys to hold secrets that shouldn't be -# written to disk (generally used for NixOps, harmless elsewhere). -if ! mountpoint -q /run/keys; then - rm -rf /run/keys - mkdir /run/keys - mount -t ramfs ramfs /run/keys - chown 0:96 /run/keys - chmod 0750 /run/keys -fi - mkdir -m 0755 -p /run/lock |