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: f102c309c913
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 6a8bc28974ca
Choose a head ref
  • 4 commits
  • 5 files changed
  • 2 contributors

Commits on Mar 19, 2019

  1. Revert "modemmanager: rename ModemManager.service to modem-manager.se… 

    …rvice"

This reverts commit c6882b2.
    @Mic92 @flokli
    Mic92 authored and flokli committed Mar 19, 2019

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    3f9ac24 View commit details

  2. network-manager: rename systemd service back to match upstream 

    Compatibility with other distributions/software and expectation
of users coming from other systems should have higher priority over consistency.
In particular this fixes #51375, where the NetworkManager-wait-online.service
broke as a result of this.
    @Mic92 @flokli
    Mic92 authored and flokli committed Mar 19, 2019
    Copy the full SHA
    b488c60 View commit details

  3. network-manager: add legacy service name as fallback 

    This prevents NetworkManager from not starting back up while switching
configurations.

This can be removed once 19.10 is released.
    @flokli
    flokli committed Mar 19, 2019
    Copy the full SHA
    69cd72b View commit details

  4. Merge pull request #51382 from Mic92/network-manager 

    Networkmanager: rename service to match upstream
    @flokli
    flokli authored Mar 19, 2019
    Copy the full SHA
    6a8bc28 View commit details
2 changes: 1 addition & 1 deletion nixos/doc/manual/installation/installing.xml
View file
Original file line number Diff line number Diff line change
@@ -54,7 +54,7 @@

<para>
To manually configure the network on the graphical installer, first disable
network-manager with <command>systemctl stop network-manager</command>.
network-manager with <command>systemctl stop NetworkManager</command>.
</para>

<para>
7 changes: 7 additions & 0 deletions nixos/doc/manual/release-notes/rl-1903.xml
View file
Original file line number Diff line number Diff line change
@@ -216,6 +216,13 @@
<literal>[]</literal>.
</para>
</listitem>
<listitem>
<para>
The NetworkManager systemd unit was renamed back from network-manager.service to
NetworkManager.service for better compatibility with other applications expecting this name.
The same applies to ModemManager where modem-manager.service is now called ModemManager.service again.
</para>
</listitem>
<listitem>
<para>
Package <varname>rabbitmq_server</varname> is renamed to
8 changes: 4 additions & 4 deletions nixos/modules/services/networking/networkmanager.nix
View file
Original file line number Diff line number Diff line change
@@ -466,7 +466,7 @@ in {

systemd.packages = cfg.packages;

systemd.services."network-manager" = {
systemd.services."NetworkManager" = {
wantedBy = [ "network.target" ];
restartTriggers = [ configFile ];

@@ -478,9 +478,9 @@ in {
};

systemd.services.nm-setup-hostsdirs = mkIf dynamicHostsEnabled {
wantedBy = [ "network-manager.service" ];
before = [ "network-manager.service" ];
partOf = [ "network-manager.service" ];
wantedBy = [ "NetworkManager.service" ];
before = [ "NetworkManager.service" ];
partOf = [ "NetworkManager.service" ];
script = concatStrings (mapAttrsToList (n: d: ''
mkdir -p "/run/NetworkManager/hostsdirs/${n}"
chown "${d.user}:${d.group}" "/run/NetworkManager/hostsdirs/${n}"
5 changes: 1 addition & 4 deletions pkgs/tools/networking/modem-manager/default.nix
View file
Original file line number Diff line number Diff line change
@@ -33,12 +33,9 @@ stdenv.mkDerivation rec {
doCheck = true;

postInstall = ''
# rename to modem-manager to be in style
mv $out/etc/systemd/system/ModemManager.service $out/etc/systemd/system/modem-manager.service
# systemd in NixOS doesn't use `systemctl enable`, so we need to establish
# aliases ourselves.
ln -s $out/etc/systemd/system/modem-manager.service \
ln -s $out/etc/systemd/system/ModemManager.service \
$out/etc/systemd/system/dbus-org.freedesktop.ModemManager1.service
'';

10 changes: 6 additions & 4 deletions pkgs/tools/networking/network-manager/default.nix
View file
Original file line number Diff line number Diff line change
@@ -88,13 +88,15 @@ in stdenv.mkDerivation rec {
# FIXME: Workaround until NixOS' dbus+systemd supports at_console policy
substituteInPlace $out/etc/dbus-1/system.d/org.freedesktop.NetworkManager.conf --replace 'at_console="true"' 'group="networkmanager"'
# rename to network-manager to be in style
mv $out/etc/systemd/system/NetworkManager.service $out/etc/systemd/system/network-manager.service
# systemd in NixOS doesn't use `systemctl enable`, so we need to establish
# aliases ourselves.
ln -s $out/etc/systemd/system/NetworkManager-dispatcher.service $out/etc/systemd/system/dbus-org.freedesktop.nm-dispatcher.service
ln -s $out/etc/systemd/system/network-manager.service $out/etc/systemd/system/dbus-org.freedesktop.NetworkManager.service
ln -s $out/etc/systemd/system/NetworkManager.service $out/etc/systemd/system/dbus-org.freedesktop.NetworkManager.service
# Add the legacy service name from before #51382 to prevent NetworkManager
# from not starting back up:
# TODO: remove this once 19.10 is released
ln -s $out/etc/systemd/system/NetworkManager.service $out/etc/systemd/system/network-manager.service
'';

passthru = {