-
-
Notifications
You must be signed in to change notification settings - Fork 14.6k
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
linux-pam: make it use SUID wrapped version of unix_ckpwd #156974
Conversation
It's unfortunate that the rebuild is large, so it's not so easy to test. It would be nice to get confirmation that known regressions really do get fixed by this. |
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.
Diff LGTM.
Rebuilding my system with this change, as I was bitten by the swaylock problem this morning. |
This seems to apply only to pam, right? kscreenlocker seems to use pam lib, and have no direct reference to |
I think this would also fix invocation via the lib, using the EDIT: or more precisely, I'd hope this addresses all methods of |
68ca365
to
ffdadd3
Compare
Can confirm swaylock unlock works again. |
If possible, despite it being a big rebuild, I'd call for the fix for this issue (be it this PR or the revert approach) to be merged directly to |
May just be me being selfish, but I agree. Would be nice to not have to |
Merge to master would be nice 👍 i3lock is also affected by this. |
I'm really sorry for the regression. Precise rebuild amounts pulled from ofborg-eval (quite high):
|
loginctl unlock-sessions should do it. |
If it's the same issue "switch user" on kde and then login to the same user seemed to work yesterday. |
We can't really expect people to work around broken lockscreens for two weeks, so this should probably go to master instead. |
We might at least look for other very-important (or unlikely-to-break) changes in People can roll back; that doesn't seem terribly surprising on "-unstable" (though I really am sorry for this). I'm also not clear about if this PR is sufficiently confirmed or we rather revert. |
I'm rebuilding my system with this PR to see if it fixes the problem, but it's taking quite a long time. |
I am also very sorry for this regression. @vcunat I'd say that if multiple people (using different lock screens) have their issues fixed, then we should consider this PR over reverting. |
The rebuild is taking too long, i've given up. Is there another way to test this PR with i3lock without rebuilding the entire system? |
Rebuild just i3lock, I think. |
Confirmed. Rebuilding just |
Same with |
I have a build running of plasma mobile, though I suspect it's going to take 10+ hours more until it's done. Given your observations, the few testers who reported successes, and the scope of the issue, I guess this can be at least undrafted? |
hello |
In the meantime, here's the fix provided as an overlay: # some-overlay.nix
final: prev:
let
patchedPkgs = import (builtins.fetchTarball {
url = "https://github.com/nixos/nixpkgs/archive/ffdadd3ef9167657657d60daf3fe0f1b3176402d.tar.gz";
sha256 = "1nrz4vzjsf3n8wlnxskgcgcvpwaymrlff690f5njm4nl0rv22hkh";
}) {
inherit (prev) system config;
# inherit (prev) overlays; # not sure
};
patchedPam = patchedPkgs.pam;
in {
i3lock = prev.i3lock.override { pam = patchedPam; };
# apply the same patch to other packages
} (I was brought here due to a discussion in the HM matrix room) |
Also confirmed with |
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.
seems like everyone is good with this going into staging
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.
@vcunat Don't worry - these things happen ;) |
I think this should be fixed on master as well soon, as previously said:
Are there any plans to do so? I guess someone has to open another PR with the same changes to master? Should I just do that? |
No. For days we've only been waiting for the rebuilds to finish; something like 2/3 done now. You can watch the counts on https://hydra.nixos.org/jobset/nixpkgs/staging-next |
Naturally, you can use the |
Do you mean to say that after those rebuilds are done another pr to master can be started or that the rebuilds are so much load that we shouldn't do another PR? 😅 was a bit confused |
@NANASHI0X74 The PR to master is #157215, and it will be merged when rebuilds finish. |
ahh, thanks a lot, I didn't see that one 😄 |
Motivation for this change
Fix regressions like #153104 (comment)
Things done
sandbox = true
set innix.conf
? (See Nix manual)nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD"
. Note: all changes have to be committed, also see nixpkgs-review usage./result/bin/
)nixos/doc/manual/md-to-db.sh
to update generated release notes