diff options
| author | Vladimír Čunát <v@cunat.cz> | 2019-09-28 07:43:04 +0200 |
|---|---|---|
| committer | Vladimír Čunát <v@cunat.cz> | 2019-09-28 07:43:04 +0200 |
| commit | fda4a08d4a1dd1509bb4c3ab110fb8665f47cc00 (patch) | |
| tree | dba7ec5e6a0757a413e8cb9dfb01bb14abc469f4 /nixos | |
| parent | 15f9bdb6489e7e55a861958a9388bf5ad3b2d2cd (diff) | |
| parent | 217cf982c754f1e8506e180551c73f57c04aed7f (diff) | |
| download | nixlib-fda4a08d4a1dd1509bb4c3ab110fb8665f47cc00.tar nixlib-fda4a08d4a1dd1509bb4c3ab110fb8665f47cc00.tar.gz nixlib-fda4a08d4a1dd1509bb4c3ab110fb8665f47cc00.tar.bz2 nixlib-fda4a08d4a1dd1509bb4c3ab110fb8665f47cc00.tar.lz nixlib-fda4a08d4a1dd1509bb4c3ab110fb8665f47cc00.tar.xz nixlib-fda4a08d4a1dd1509bb4c3ab110fb8665f47cc00.tar.zst nixlib-fda4a08d4a1dd1509bb4c3ab110fb8665f47cc00.zip | |
Merge branch 'staging-next'
There are several security fixes - again, as it consists mainly of the previously reverted staging-next merge.
Diffstat (limited to 'nixos')
| -rw-r--r-- | nixos/modules/services/networking/networkmanager.nix | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/nixos/modules/services/networking/networkmanager.nix b/nixos/modules/services/networking/networkmanager.nix index 887c89ddf3ab..a137045834bc 100644 --- a/nixos/modules/services/networking/networkmanager.nix +++ b/nixos/modules/services/networking/networkmanager.nix @@ -469,12 +469,16 @@ 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" ]; @@ -496,6 +500,7 @@ 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 |