about summary refs log tree commit diff
diff options
context:
space:
mode:
authorMatthew Bauer <mjbauer95@gmail.com>2019-08-23T03·38-0400
committerMatthew Bauer <mjbauer95@gmail.com>2019-08-23T03·38-0400
commit0463d5e36ffdbb60f851bd3b34756eff84151b28 (patch)
tree41298eafa9a92f36f88a7c7cae88cf437986c13d
parentf435634a29551754d5f7303b0a60cd8fe2df2079 (diff)
Allow empty /nix directory in multi-user installer
With macOS catalina, we can no longer modify the root system
volume (#2925). macOS provides a system configuration file in
synthetic.conf(5) to create empty root directories. This can be used
to mount /nix to a separate volume. As a result, this directory will
need to already exist prior to installation. Instead, check for
/nix/store and /nix/var for a live Nix installation.
-rw-r--r--scripts/install-multi-user.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/install-multi-user.sh b/scripts/install-multi-user.sh
index 9b757e7da3f2..3d8b035eb7d1 100644
--- a/scripts/install-multi-user.sh
+++ b/scripts/install-multi-user.sh
@@ -330,7 +330,7 @@ EOF
         fi
     done
 
-    if [ -d /nix ]; then
+    if [ -d /nix/store ] || [ -d /nix/var ]; then
         failure <<EOF
 There are some relics of a previous installation of Nix at /nix, and
 this scripts assumes Nix is _not_ yet installed. Please delete the old