wroclaw-git-backups/nix
1
0
Fork 0
mirror of https://github.com/NixOS/nix synced 2025-06-27 00:11:17 +02:00
Code Activity

darwin-store: Ensure NIX_ROOT is mounted after reboot.

Browse source 
When a darwin host is rebooted, /nix was not mounted.  Let the daemon
also wait until the store mounting service is finished.
This commit is contained in:
John Soo 2021-11-30 15:33:15 -08:00
parent 5d959b33c5
commit bfbc0c60cc
No known key found for this signature in database
GPG key ID: D8A148F8CE4DDBC2
2 changed files with 12 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

8
misc/launchd/org.nixos.nix-daemon.plist.in
View file

@ -13,14 +13,12 @@
<string>org.nixos.nix-daemon</string> <string>org.nixos.nix-daemon</string>
<key>KeepAlive</key> <key>KeepAlive</key>
<dict> <dict>
<key>PathState</key> <key>OtherJobEnabled</key>
<dict> <dict>
<key>/nix/var/nix/profiles/default/bin/nix-daemon</key> <key>org.nixos.darwin-store</key>
<true/> <false/>
</dict> </dict>
</dict> </dict>
<key>RunAtLoad</key>
<true/>
<key>ProgramArguments</key> <key>ProgramArguments</key>
<array> <array>
<string>/nix/var/nix/profiles/default/bin/nix-daemon</string> <string>/nix/var/nix/profiles/default/bin/nix-daemon</string>

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

@ -303,8 +303,16 @@ generate_mount_daemon() {
<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"> <!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0"> <plist version="1.0">
<dict> <dict>
<key>RunAtLoad</key> <key>LaunchOnlyOnce</key>
<true/> <true/>
<key>KeepAlive</key>
<dict>
<key>PathState</key>
<dict>
<key>$NIX_ROOT/store</key>
<false/>
</dict>
</dict>
<key>Label</key> <key>Label</key>
<string>org.nixos.darwin-store</string> <string>org.nixos.darwin-store</string>
<key>ProgramArguments</key> <key>ProgramArguments</key>