mirrors/nix-darwin
1
0
Fork 0
mirror of https://github.com/LnL7/nix-darwin.git synced 2024-12-14 11:57:34 +00:00
Code Activity

fix dependence on apfs.util exit code

Browse source 
apfs.util (or at least it's newer -t flag) has bad exit code semantics
and will return non-zero codes for both success and errors.

Closes #401 and most-likely fixes #378 as well
This commit is contained in:
Travis A. Everett 2021-12-13 12:34:51 -06:00
parent e8f4288d16
commit 94c3e407dd
1 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
pkgs/darwin-installer/configuration.nix
View file

@ -43,16 +43,21 @@ with lib;
case "$i" in
y|Y)
if ! grep -q '^run\b' /etc/synthetic.conf 2>/dev/null; then
echo "setting up /etc/synthetic.conf..."
echo "setting up /run via /etc/synthetic.conf..."
echo -e "run\tprivate/var/run" | sudo tee -a /etc/synthetic.conf >/dev/null
/System/Library/Filesystems/apfs.fs/Contents/Resources/apfs.util -B &>/dev/null \
|| /System/Library/Filesystems/apfs.fs/Contents/Resources/apfs.util -t &>/dev/null \
|| echo "warning: failed to execute apfs.util"
/System/Library/Filesystems/apfs.fs/Contents/Resources/apfs.util -B &>/dev/null || true
/System/Library/Filesystems/apfs.fs/Contents/Resources/apfs.util -t &>/dev/null || true
if ! test -L /run; then
echo "warning: apfs.util failed to symlink /run"
fi
fi
if ! test -L /run; then
echo "setting up /run..."
sudo ln -sfn private/var/run /run
fi
if ! test -L /run; then
echo "warning: failed to symlink /run"
fi
;;
esac
fi