Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

macos: always pass -a "${VOLUME}" and -s "Nix Store" #1236

Closed
wants to merge 2 commits into from
+2 −2
Closed

macos: always pass -a "${VOLUME}" and -s "Nix Store" #1236

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c206cd7
encrypt_apfs_volume: always pass `-a "${VOLUME}"` and `-s "Nix Store"`
hispirus Oct 17, 2024
efc3eb6
create_volume_service: always pass `-a "${VOLUME}"` and `-s "Nix Store"`
hispirus Oct 17, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
create_volume_service: always pass -a "${VOLUME}" and -s "Nix Store" 
`/usr/bin/security {add,find,delete}-generic-password` accepts both `-a account` and `-s service` parameters as password lookup keys. Always pass `-a "${VOLUME}"` and `-s "Nix Store"`. With this change, installation succeeds even with `--encrypt` set to `true` and `--volume-label` set to any value deviating from `Nix Store`.
@hispirus
hispirus authored Oct 17, 2024
commit efc3eb6b43de1c823126781d9e91640c0ce9f7e5
2 changes: 1 addition & 1 deletion src/action/macos/create_volume_service.rs
View file
Original file line number Diff line number Diff line change
@@ -258,7 +258,7 @@ async fn generate_mount_plist(
// The official Nix scripts uppercase the UUID, so we do as well for compatibility.
let uuid_string = uuid.to_string().to_uppercase();
let mount_command = if encrypt {
let encrypted_command = format!("/usr/bin/security find-generic-password -s {apfs_volume_label_with_quotes} -w | /usr/sbin/diskutil apfs unlockVolume {apfs_volume_label_with_quotes} -mountpoint {mount_point:?} -stdinpassphrase");
let encrypted_command = format!("/usr/bin/security find-generic-password -a {apfs_volume_label_with_quotes} -s \"Nix Store\" -w | /usr/sbin/diskutil apfs unlockVolume {apfs_volume_label_with_quotes} -mountpoint {mount_point:?} -stdinpassphrase");
vec!["/bin/sh".into(), "-c".into(), encrypted_command]
} else {
vec![