From 3f9ac24d531090a6b49afd212b5cf2b78c825b94 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Sun, 2 Dec 2018 12:19:30 +0000 Subject: [PATCH 1/3] Revert "modemmanager: rename ModemManager.service to modem-manager.service" This reverts commit c6882b2cf9fa13579f64d5c33cbc071fa5d5e884. --- pkgs/tools/networking/modem-manager/default.nix | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/pkgs/tools/networking/modem-manager/default.nix b/pkgs/tools/networking/modem-manager/default.nix index cb63b2be152..6f0732b8cfd 100644 --- a/pkgs/tools/networking/modem-manager/default.nix +++ b/pkgs/tools/networking/modem-manager/default.nix @@ -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 ''; From b488c60cdb0a9fb913d8b463f17fe89b45b4d50a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Sun, 2 Dec 2018 12:11:44 +0000 Subject: [PATCH 2/3] 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. --- nixos/doc/manual/installation/installing.xml | 2 +- nixos/doc/manual/release-notes/rl-1903.xml | 7 +++++++ nixos/modules/services/networking/networkmanager.nix | 8 ++++---- pkgs/tools/networking/network-manager/default.nix | 5 +---- 4 files changed, 13 insertions(+), 9 deletions(-) diff --git a/nixos/doc/manual/installation/installing.xml b/nixos/doc/manual/installation/installing.xml index f4f8d470f80..9687c21a01e 100644 --- a/nixos/doc/manual/installation/installing.xml +++ b/nixos/doc/manual/installation/installing.xml @@ -54,7 +54,7 @@ To manually configure the network on the graphical installer, first disable - network-manager with systemctl stop network-manager. + network-manager with systemctl stop NetworkManager. diff --git a/nixos/doc/manual/release-notes/rl-1903.xml b/nixos/doc/manual/release-notes/rl-1903.xml index a82724d7fb5..931c3be5913 100644 --- a/nixos/doc/manual/release-notes/rl-1903.xml +++ b/nixos/doc/manual/release-notes/rl-1903.xml @@ -216,6 +216,13 @@ []. + + + 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. + + Package rabbitmq_server is renamed to diff --git a/nixos/modules/services/networking/networkmanager.nix b/nixos/modules/services/networking/networkmanager.nix index d372dfd8f41..5e554447181 100644 --- a/nixos/modules/services/networking/networkmanager.nix +++ b/nixos/modules/services/networking/networkmanager.nix @@ -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}" diff --git a/pkgs/tools/networking/network-manager/default.nix b/pkgs/tools/networking/network-manager/default.nix index f18e8ad9f5c..58fdd1f45b6 100644 --- a/pkgs/tools/networking/network-manager/default.nix +++ b/pkgs/tools/networking/network-manager/default.nix @@ -88,13 +88,10 @@ 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 ''; passthru = { From 69cd72b3e178a21b0974f5d9b9c151be9f85f2a7 Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Tue, 19 Mar 2019 01:54:27 +0100 Subject: [PATCH 3/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. --- pkgs/tools/networking/network-manager/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/tools/networking/network-manager/default.nix b/pkgs/tools/networking/network-manager/default.nix index 58fdd1f45b6..2ead22a550a 100644 --- a/pkgs/tools/networking/network-manager/default.nix +++ b/pkgs/tools/networking/network-manager/default.nix @@ -92,6 +92,11 @@ in stdenv.mkDerivation rec { # 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/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 = {