diff options
| author | Will Dietz <w@wdtz.org> | 2019-09-13 11:11:53 -0500 |
|---|---|---|
| committer | Will Dietz <w@wdtz.org> | 2019-09-13 21:02:39 -0500 |
| commit | f99bdb2b615da434e0f2814a5924a2aa6a7a1f66 (patch) | |
| tree | 4aaaa32cf4ee3720dd9fb77b91a42a36ad61175c /pkgs/tools | |
| parent | a412701c8de181777558677b16be0bfed6eba519 (diff) | |
networkmanager,modemmanager: fix service symlinks for systemd v243
Fixes problems such as: systemd[1]: Failed to put bus name to hashmap: File exists systemd[1]: dbus-org.freedesktop.nm-dispatcher.service: Two services allocated for the same bus name org.freedesktop.nm_dispatcher, refusing operation. Problem is that systemd treats symlinks to files outside the service path differently, causing our old workaround to look like two separate services. These symlinks are intended to be a means for manually emulating the behavior of the `Alias=` directive in these services. Unfortunately even making these symlinks relative isn't enough, since they don't make it to where it matters-- that only makes the links in /etc/static/systemd/system/* relative, with systemd still being shown non-relative links in /etc/systemd/system/*. To fix this, drop all of this at the package level and instead simply specify the aliases in the NixOS modules. Also handle the same for modemmanager, since the networkmanager NixOS module also handles that.
Diffstat (limited to 'pkgs/tools')
| -rw-r--r-- | pkgs/tools/networking/modem-manager/default.nix | 7 | ||||
| -rw-r--r-- | pkgs/tools/networking/network-manager/default.nix | 5 |
2 files changed, 0 insertions, 12 deletions
diff --git a/pkgs/tools/networking/modem-manager/default.nix b/pkgs/tools/networking/modem-manager/default.nix index b2644d0c2a496..fedc8d4b71d7f 100644 --- a/pkgs/tools/networking/modem-manager/default.nix +++ b/pkgs/tools/networking/modem-manager/default.nix @@ -32,13 +32,6 @@ stdenv.mkDerivation rec { doCheck = true; - postInstall = '' - # systemd in NixOS doesn't use `systemctl enable`, so we need to establish - # aliases ourselves. - ln -s $out/etc/systemd/system/ModemManager.service \ - $out/etc/systemd/system/dbus-org.freedesktop.ModemManager1.service - ''; - meta = with stdenv.lib; { description = "WWAN modem manager, part of NetworkManager"; homepage = https://www.freedesktop.org/wiki/Software/ModemManager/; diff --git a/pkgs/tools/networking/network-manager/default.nix b/pkgs/tools/networking/network-manager/default.nix index 5bc915caea650..490ebd0fa6bb0 100644 --- a/pkgs/tools/networking/network-manager/default.nix +++ b/pkgs/tools/networking/network-manager/default.nix @@ -97,11 +97,6 @@ in stdenv.mkDerivation rec { ''; postInstall = '' - # 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/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 |