diff options
| author | Jörg Thalheim <joerg@thalheim.io> | 2018-12-02 12:11:44 +0000 |
|---|---|---|
| committer | Florian Klink <flokli@flokli.de> | 2019-03-19 23:48:08 +0100 |
| commit | b488c60cdb0a9fb913d8b463f17fe89b45b4d50a (patch) | |
| tree | d0c649420950db8b0e56dfb1aa10426675296067 /pkgs/tools/networking/network-manager | |
| parent | 3f9ac24d531090a6b49afd212b5cf2b78c825b94 (diff) | |
| download | nixlib-b488c60cdb0a9fb913d8b463f17fe89b45b4d50a.tar nixlib-b488c60cdb0a9fb913d8b463f17fe89b45b4d50a.tar.gz nixlib-b488c60cdb0a9fb913d8b463f17fe89b45b4d50a.tar.bz2 nixlib-b488c60cdb0a9fb913d8b463f17fe89b45b4d50a.tar.lz nixlib-b488c60cdb0a9fb913d8b463f17fe89b45b4d50a.tar.xz nixlib-b488c60cdb0a9fb913d8b463f17fe89b45b4d50a.tar.zst nixlib-b488c60cdb0a9fb913d8b463f17fe89b45b4d50a.zip | |
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.
Diffstat (limited to 'pkgs/tools/networking/network-manager')
| -rw-r--r-- | pkgs/tools/networking/network-manager/default.nix | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/pkgs/tools/networking/network-manager/default.nix b/pkgs/tools/networking/network-manager/default.nix index f18e8ad9f5c0..58fdd1f45b60 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 = { |