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

Jump to bottom

Various logic fixups in preparation for phased uninstall #1277

Merged
merged 11 commits into from
Nov 8, 2024
Merged

Various logic fixups in preparation for phased uninstall #1277

merged 11 commits into from
Nov 8, 2024

Conversation

cole-h
Copy link
Member

@cole-h cole-h commented Nov 8, 2024

Description

None of this changes the receipt or anything, so we could merge it now and release it if we have to.

Checklist
  • Formatted with cargo fmt
  • Built with nix build
  • Ran flake checks with nix flake check
  • Added or updated relevant tests (leave unchecked if not applicable)
  • Added or updated relevant documentation (leave unchecked if not applicable)
  • Linked to related issues (leave unchecked if not applicable)
Validating with install.determinate.systems

If a maintainer has added the upload to s3 label to this PR, it will become available for installation via install.determinate.systems:

curl --proto '=https' --tlsv1.2 -sSf -L https://install.determinate.systems/nix/pr/$PR_NUMBER | sh -s -- install

@cole-h
EncryptApfsVolume: fix encryption detection, enable curing
117b6ea
@cole-h
fixup: launchctl print does not take a -plist flag
77e47b0
@cole-h
fixup: we always thought the service was started
378f910 
The string "not running" contains "running", so we'd always set
`service_started = true;` here. That's wrong, so instead check for "does
not contain 'not running'".

This does open us up to thinking that anything that is not "not running"
is running, but we can address that later, if it becomes an issue.

Also I'm pretty sure we don't need this at all, since it's always "not
running" after it mounts the volume... But I'll leave that for later.
@cole-h
BootstrapLaunchctlService: always run
714a229
@cole-h
KickstartLaunchctlService: use execute_command helper
df58f96
@cole-h
fixup: get_uuid_for_label -> get_disk_info_for_label
0400556 
For a follow-up commit.
@cole-h
If a Nix Store volume already exists and is encrypted with FileVault,…
dbd5d8f 
… force `encrypt` to true
@cole-h
fixup: check_loaded should not print to stdout/stderr, should use DAR…
a452ef9 
…WIN_LAUNCHD_DOMAIN const
@cole-h
fixup: cargo clippy
445188e
grahamc
grahamc approved these changes Nov 8, 2024
View reviewed changes
Copy link
Member

@grahamc grahamc left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Stunning. 👏

@cole-h
fixup: check_loaded_output -> check_loaded
525ac82 
Even though the exit code is an output of running the program, it's not
textual output on stdout / stderr.
@cole-h
fixup: make comment more readable
30357e0
@cole-h cole-h enabled auto-merge (squash) November 8, 2024 19:36
@cole-h cole-h disabled auto-merge November 8, 2024 19:36
@cole-h cole-h enabled auto-merge (squash) November 8, 2024 19:41
@cole-h cole-h mentioned this pull request Nov 8, 2024
Merged
9 tasks
@cole-h cole-h merged commit d85fb91 into main Nov 8, 2024
21 checks passed
@cole-h cole-h deleted the phased-uninstall-related branch November 8, 2024 19:51
@cole-h cole-h added this to the 0.28.0 milestone Nov 8, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@grahamc grahamc grahamc approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
0.28.0
Development

Successfully merging this pull request may close these issues.
2 participants
@cole-h @grahamc