Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 8bc2cb989243
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: a72d6f9349ab
Choose a head ref
  • 2 commits
  • 1 file changed
  • 1 contributor

Commits on May 5, 2019

  1. networkmanager: network-online --wants--> NetworkManager-wait-online

    @dtzWill
    dtzWill committed May 5, 2019

    Partially verified

    This commit is signed with the committer’s verified signature.
    domenkozar’s contribution has been verified via GPG key.
    We cannot verify signatures from co-authors, and some of the co-authors attributed to this commit require their commits to be signed.
    Copy the full SHA
    4588661 View commit details

Commits on May 31, 2019

  1. Merge pull request #60954 from dtzWill/fix/network-online-actually-on… 

    …line-with-networkmanager

networkmanager: network-online --wants--> NetworkManager-wait-online
    @dtzWill
    dtzWill authored May 31, 2019

    Verified

    This commit was signed with the committer’s verified signature.
    domenkozar Domen Kožar
    GPG key ID: C2FFBCAFD2C24246
    Verified
    Learn about vigilant mode
    Copy the full SHA
    a72d6f9 View commit details
Showing with 4 additions and 0 deletions.
  1. +4 −0 nixos/modules/services/networking/networkmanager.nix
4 changes: 4 additions & 0 deletions nixos/modules/services/networking/networkmanager.nix
View file
Original file line number Diff line number Diff line change
@@ -477,6 +477,10 @@ in {
'';
};

systemd.services.NetworkManager-wait-online = {
wantedBy = [ "network-online.target" ];
};

systemd.services.nm-setup-hostsdirs = mkIf dynamicHostsEnabled {
wantedBy = [ "NetworkManager.service" ];
before = [ "NetworkManager.service" ];