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.
This commit is contained in:
Matthew Bauer 2019-08-22 23:38:52 -04:00
parent f435634a29
commit 0463d5e36f

View file

@ -330,7 +330,7 @@ EOF
fi fi
done done
if [ -d /nix ]; then if [ -d /nix/store ] || [ -d /nix/var ]; then
failure <<EOF failure <<EOF
There are some relics of a previous installation of Nix at /nix, and 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 this scripts assumes Nix is _not_ yet installed. Please delete the old