-
-
Notifications
You must be signed in to change notification settings - Fork 14.5k
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.
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
nixos/unl0kr: fix tests, change default package to buffybox (bumps unl0kr to 3.2.0-unstable-2024-11-10) #362825
base: master
Are you sure you want to change the base?
Conversation
It seems that changing from the unl0kr to package to buffybox is trivial. I'll test to see if it works on a real installation, then test how nicely it plays with early video loading then I'll mark the unl0kr package as deprecated |
I'm about to open an issue regarding the module needed in order to create tests. It's unacceptable that it takes an N amount of seconds to take two screenshots and type a string of characters |
e3979d5
to
5b02606
Compare
How do I set a package as deprecated? (not to prevent anyone from using it just to warn that it's going to be removed soon) |
d0725e4
to
085dfe9
Compare
let me finish the docs on this rq |
@ofborg test systemd-initrd-luks-unl0kr |
The long awaited unl0kr update is real now |
@ofborg test systemd-initrd-luks-unl0kr |
oh come on how could this happen |
@ofborg test systemd-initrd-luks-unl0kr |
This pull request has been mentioned on NixOS Discourse. There might be relevant details there: https://discourse.nixos.org/t/prs-ready-for-review/3032/4932 |
STILL TESTING ON AARCH64??? |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Can we please just remove the old package? Why are we bothering to deprecate it? We literally have a current version of the same package, it's just named differently.
I like your mindset |
ebc17c4
to
5885b26
Compare
@ofborg test systemd-initrd-luks-unl0kr |
@ElvishJerricco looks like unl0kr's password agent has been re-implemented in C. Should I look into it after this PR or within this PR? Both (what we have in the module and what they have on their repo) should effectively do the same thing but I'm not sure how much better is the one from upstream. However, it's not present on any stable release but it is present on the ref specified by the buffybox package. |
Converted to draft again, matching the systemd service with upstream It's more interesting than what it looks like. It might even fix compatibility issues with plymouth |
@ofborg test systemd-initrd-luks-unl0kr |
@ofborg test systemd-initrd-luks-unl0kr |
@ofborg test systemd-initrd-luks-unl0kr |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Sorry it took me so long to get around to reviewing this. Looks like CI isn't happy with the formatting somewhere.
unl0kr-ask-password = { | ||
description = "Forward Password Requests to unl0kr"; | ||
unl0kr-agent = { | ||
description = "Dispatch Password Requests to unl0kr"; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Did you try just adding buffybox
to boot.initrd.systemd.packages
rather than duplicating the upstream systemd units? Would be a lot cleaner. Should just need to manually add the necessary wantedBy
to the path
unit.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I'm attempting to use the password agent from upstream, rewritten in C.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I currently don't know how to debug the systemd service, is there a manual entry for debugging stage 1 services?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
There should be a way to get a shell in stage 1, then you can manually run commands to check whatever you want to do. Would that be helpful?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I'm attempting to use the password agent from upstream, rewritten in C.
Yes. The buffybox package has upstream unit files that can be included in initrd automatically by setting boot.initrd.systemd.packages = [ buffybox ];
so you don't have to reimplement the units yourself here.
I currently don't know how to debug the systemd service, is there a manual entry for debugging stage 1 services?
You can get a debug shell in systemd initrd by adding the rd.systemd.debug_shell
kernel param and switching to VT9
075a074
to
5ca3e76
Compare
@@ -1325,6 +1325,7 @@ mapAliases { | |||
unifi8 = unifi; # Added 2024-11-15 | |||
unifiLTS = throw "'unifiLTS' has been removed since UniFi no longer has LTS and stable releases. Use `pkgs.unifi` instead."; # Added 2024-04-11 | |||
unifiStable = throw "'unifiStable' has been removed since UniFi no longer has LTS and stable releases. Use `pkgs.unifi` instead."; # Converted to throw 2024-04-11 | |||
unl0kr = throw "'unl0kr' is now included with buffybox. Use `pkgs.buffybox` instead."; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Should we add a comment with the date at the end?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Forgout about it
Things done
nix.conf
? (See Nix manual)sandbox = relaxed
sandbox = true
nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD"
. Note: all changes have to be committed, also see nixpkgs-review usage./result/bin/
)Add a 👍 reaction to pull requests you find important.