Revert "networkmanager,modemmanager: fix service symlinks for systemd v243"
This commit is contained in:
parent
e8bc2a6ac0
commit
3cb0ae999f
|
@ -468,16 +468,12 @@ in {
|
|||
mkdir -m 700 -p /etc/ipsec.d
|
||||
mkdir -m 755 -p ${stateDirs}
|
||||
'';
|
||||
|
||||
aliases = [ "dbus-org.freedesktop.NetworkManager.service" ];
|
||||
};
|
||||
|
||||
systemd.services.NetworkManager-wait-online = {
|
||||
wantedBy = [ "network-online.target" ];
|
||||
};
|
||||
|
||||
systemd.services.ModemManager.aliases = [ "dbus-org.freedesktop.ModemManager1.service" ];
|
||||
|
||||
systemd.services.nm-setup-hostsdirs = mkIf dynamicHostsEnabled {
|
||||
wantedBy = [ "NetworkManager.service" ];
|
||||
before = [ "NetworkManager.service" ];
|
||||
|
@ -499,7 +495,6 @@ in {
|
|||
|
||||
# useful binaries for user-specified hooks
|
||||
path = [ pkgs.iproute pkgs.utillinux pkgs.coreutils ];
|
||||
aliases = [ "dbus-org.freedesktop.nm-dispatcher.service" ];
|
||||
};
|
||||
|
||||
# Turn off NixOS' network management when networking is managed entirely by NetworkManager
|
||||
|
|
|
@ -32,6 +32,13 @@ 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/;
|
||||
|
|
|
@ -97,6 +97,11 @@ 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
|
||||
|
|
Loading…
Reference in a new issue