public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #68731 from dtzWill/fix/networkmanager-dbus-service-aliases 

networkmanager,modemmanager: fix service symlinks for systemd v243
This commit is contained in:
worldofpeace 2019-09-14 08:03:12 -04:00 committed by GitHub
parent e06aa820c9 f99bdb2b61
commit e8bc2a6ac0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
nixos/modules/services/networking/networkmanager.nix
View File

@ -468,12 +468,16 @@ in {
mkdir -m 700 -p /etc/ipsec.d mkdir -m 700 -p /etc/ipsec.d
mkdir -m 755 -p ${stateDirs} mkdir -m 755 -p ${stateDirs}
''; '';
aliases = [ "dbus-org.freedesktop.NetworkManager.service" ];
}; };
systemd.services.NetworkManager-wait-online = { systemd.services.NetworkManager-wait-online = {
wantedBy = [ "network-online.target" ]; wantedBy = [ "network-online.target" ];
}; };
systemd.services.ModemManager.aliases = [ "dbus-org.freedesktop.ModemManager1.service" ];
systemd.services.nm-setup-hostsdirs = mkIf dynamicHostsEnabled { systemd.services.nm-setup-hostsdirs = mkIf dynamicHostsEnabled {
wantedBy = [ "NetworkManager.service" ]; wantedBy = [ "NetworkManager.service" ];
before = [ "NetworkManager.service" ]; before = [ "NetworkManager.service" ];
@ -495,6 +499,7 @@ in {
# useful binaries for user-specified hooks # useful binaries for user-specified hooks
path = [ pkgs.iproute pkgs.utillinux pkgs.coreutils ]; 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 # Turn off NixOS' network management when networking is managed entirely by NetworkManager

7
pkgs/tools/networking/modem-manager/default.nix
View File

@ -32,13 +32,6 @@ stdenv.mkDerivation rec {
doCheck = true; 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; { meta = with stdenv.lib; {
description = "WWAN modem manager, part of NetworkManager"; description = "WWAN modem manager, part of NetworkManager";
homepage = https://www.freedesktop.org/wiki/Software/ModemManager/; homepage = https://www.freedesktop.org/wiki/Software/ModemManager/;

5
pkgs/tools/networking/network-manager/default.nix
View File

@ -97,11 +97,6 @@ in stdenv.mkDerivation rec {
''; '';
postInstall = '' 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 # Add the legacy service name from before #51382 to prevent NetworkManager
# from not starting back up: # from not starting back up:
# TODO: remove this once 19.10 is released # TODO: remove this once 19.10 is released