]> git.lizzy.rs Git - rust.git/commit - src/tools/miri
Rollup merge of #87187 - oxalica:fix-nixos-detect, r=nagisa
authorGuillaume Gomez <guillaume1.gomez@gmail.com>
Wed, 21 Jul 2021 13:52:44 +0000 (15:52 +0200)
committerGitHub <noreply@github.com>
Wed, 21 Jul 2021 13:52:44 +0000 (15:52 +0200)
commit2861265f26ef89828a23f70fe9c6f6f1039d145d
treebbd18566f4d576897c4c54748964033d218945dc
parentcf932aa584f2ba1a1744f3ef0b21f14387276fb6
parent919a8a5028e4b94370e9c3f6b19cda48f9c97f7b
Rollup merge of #87187 - oxalica:fix-nixos-detect, r=nagisa

Fix NixOS detection

Use `/etc/os-release` instead of `/etc/NIXOS` for detection.
The latter one does not exist on NixOS when using tmpfs as root.
src/bootstrap/bootstrap.py