cafkafk/lix
cafkafk/lix
1
0
Fork 0
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity Actions

Merge pull request #5172 from matthewbauer/enableOwnership

Browse source 
Set enableOwnership in macOS install
This commit is contained in:
Eelco Dolstra 2021-08-30 12:46:54 +02:00 committed by GitHub
commit 5f8b521d78
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
scripts/create-darwin-volume.sh
View file

@ -759,6 +759,10 @@ setup_volume() {
await_volume await_volume
if [ "$(/usr/sbin/diskutil info -plist "$NIX_ROOT" | xmllint --xpath "(/plist/dict/key[text()='GlobalPermissionsEnabled'])/following-sibling::*[1]" -)" = "<false/>" ]; then
sudo /usr/sbin/diskutil enableOwnership "$NIX_ROOT"
fi
# TODO: below is a vague kludge for now; I just don't know # TODO: below is a vague kludge for now; I just don't know
# what if any safe action there is to take here. Also, the # what if any safe action there is to take here. Also, the
# reminder isn't very helpful. # reminder isn't very helpful.

4
scripts/install-darwin-multi-user.sh
View file

@ -206,4 +206,8 @@ poly_prepare_to_install() {
EOF EOF
setup_darwin_volume setup_darwin_volume
fi fi
if [ "$(diskutil info -plist /nix | xmllint --xpath "(/plist/dict/key[text()='GlobalPermissionsEnabled'])/following-sibling::*[1]" -)" = "<false/>" ]; then
failure "This script needs a /nix volume with global permissions! This may require running sudo diskutil enableOwnership /nix."
fi
} }