Merge pull request #5500 from abathur/fix_darwin_existing_mounted_volume

darwin-install: fix already-mounted store volumes
This commit is contained in:
Eelco Dolstra 2021-11-08 13:55:19 +01:00 committed by GitHub
commit d9c9d0e0eb
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -742,6 +742,9 @@ setup_volume() {
use_special="${NIX_VOLUME_USE_SPECIAL:-$(create_volume)}"
_sudo "to ensure the Nix volume is not mounted" \
/usr/sbin/diskutil unmount force "$use_special" || true # might not be mounted
use_uuid=${NIX_VOLUME_USE_UUID:-$(volume_uuid_from_special "$use_special")}
setup_fstab "$use_uuid"