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.

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

tailscaled: after NetworkManager-wait-online #344678

Merged
merged 1 commit into from
Sep 28, 2024
Merged

Conversation

supermarin
Copy link
Contributor

@supermarin supermarin commented Sep 26, 2024

Description of changes

Follow up on #180175 - it was suggested to add this to the Tailscale module to fix the problem for 99% users.

Stuff I didn't think about: is NetworkManager-wait-online.service on every nixos installation, and what would happen if it wasn't the case?

Closes #180175

Things done

  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandboxing enabled in nix.conf? (See Nix manual)
    • sandbox = relaxed
    • sandbox = true
  • Tested, as applicable:
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • 24.11 Release Notes (or backporting 23.11 and 24.05 Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
  • Fits CONTRIBUTING.md.

Add a 👍 reaction to pull requests you find important.

@github-actions github-actions bot added 6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 8.has: module (update) This PR changes an existing module in `nixos/` labels Sep 26, 2024
@Atemu
Copy link
Member

Atemu commented Sep 26, 2024

Please squash the two commits; it's one logical change.

The wait will only be enabled on machines with NetworkManager enabled.

Closes NixOS#180175
@supermarin
Copy link
Contributor Author

Done

@ofborg ofborg bot added 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 1-10 labels Sep 26, 2024
@NickCao
Copy link
Member

NickCao commented Sep 26, 2024

Stuff I didn't think about: is NetworkManager-wait-online.service on every nixos installation, and what would happen if it wasn't the case?

Or just use network-online.target

@Atemu
Copy link
Member

Atemu commented Sep 27, 2024

It's specifically to do with NetworkManager. It should still happen before the network-online.target.

@getchoo getchoo added the 12.approvals: 1 This PR was reviewed and approved by one reputable person label Sep 27, 2024
Copy link
Member

@Atemu Atemu left a comment

Choose a reason for hiding this comment

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

I think the only good way to test this is to have it land in unstable and thereby hit people's weird systems.

Nobody has been able to repro the issue with this hacked into their config as of yet, so I think this might actually work around the issue.

@supermarin
Copy link
Contributor Author

supermarin commented Sep 27, 2024

FWIW I tried to reproduce the real issue yesterday night without any hacks, and I couldn't (but think because it wasn't restarting network manager on activation).
I think you're safe to merge as is, and I'll try to reproduce before / after in a VM or on a spare box.
If I find that the issue doesn't exist anymore in todays revision of nixpkgs, will report back here and we can revert.

@getchoo getchoo added 12.approvals: 2 This PR was reviewed and approved by two reputable people and removed 12.approvals: 1 This PR was reviewed and approved by one reputable person labels Sep 27, 2024
@getchoo
Copy link
Member

getchoo commented Sep 27, 2024

but think because it wasn't restarting network manager on activation

This does seem to be the root cause. I've experienced it personally as well for probably over a year now (so I'm extremely happy to see this 😄)

@Atemu
Copy link
Member

Atemu commented Sep 28, 2024

I don't think anyone has been able to reliably reproduce this issue before, it really is something you just need to wait out a few days~a week to trigger.

Copy link
Member

@fpletz fpletz left a comment

Choose a reason for hiding this comment

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

I think the only good way to test this is to have it land in unstable and thereby hit people's weird systems.

👍

@fpletz fpletz merged commit 1ee99a4 into NixOS:master Sep 28, 2024
30 checks passed
Copy link
Contributor

github-actions bot commented Oct 5, 2024

Successfully created backport PR for release-24.05:

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 8.has: module (update) This PR changes an existing module in `nixos/` 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 1-10 12.approvals: 2 This PR was reviewed and approved by two reputable people
Projects
None yet
Development

Successfully merging this pull request may close these issues.

NetworkManager's nm-online kills nixos-rebuild
6 participants