diff options
| author | Oliver Charles <ollie@ocharles.org.uk> | 2014-02-12 11:29:18 +0000 |
|---|---|---|
| committer | Oliver Charles <ollie@ocharles.org.uk> | 2014-02-12 11:32:49 +0000 |
| commit | 625b42838a7faf4d1cf72c98963c7d96fe36405f (patch) | |
| tree | 009b3cc66e971a0caf4052ac8d3cf4ab4bd2ddc2 /pkgs/tools/networking/network-manager | |
| parent | 7271eb50e6e4f70dd8a0b78a9894efacf17274f7 (diff) | |
| download | nixlib-625b42838a7faf4d1cf72c98963c7d96fe36405f.tar nixlib-625b42838a7faf4d1cf72c98963c7d96fe36405f.tar.gz nixlib-625b42838a7faf4d1cf72c98963c7d96fe36405f.tar.bz2 nixlib-625b42838a7faf4d1cf72c98963c7d96fe36405f.tar.lz nixlib-625b42838a7faf4d1cf72c98963c7d96fe36405f.tar.xz nixlib-625b42838a7faf4d1cf72c98963c7d96fe36405f.tar.zst nixlib-625b42838a7faf4d1cf72c98963c7d96fe36405f.zip | |
NetworkManager: Fix aliases and dependencies
There are two fixes in this commit. Firstly, I am creating proper symlinks for the Alias= definitions in the .service files. This achieves the same result as `systemctl enable`, and I think is preferred over `mv`. Secondly, `networkmanager-init` now wants `NetworkManager.service`, along with `ModemManager.service`. ModemManager does not depend on NetworkManager (according to `systemctl list-dependencies ModemManager`), thus NetworkManager never got started on boot.
Diffstat (limited to 'pkgs/tools/networking/network-manager')
| -rw-r--r-- | pkgs/tools/networking/network-manager/default.nix | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/pkgs/tools/networking/network-manager/default.nix b/pkgs/tools/networking/network-manager/default.nix index 3fb0a729dea1..6cf842dcafb4 100644 --- a/pkgs/tools/networking/network-manager/default.nix +++ b/pkgs/tools/networking/network-manager/default.nix @@ -57,12 +57,14 @@ stdenv.mkDerivation rec { postInstall = '' mkdir -p $out/lib/NetworkManager - + # 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"' - # As NixOS doesn't seem to handle systemd Aliases, we just rename the dispatcher service file - mv $out/etc/systemd/system/NetworkManager-dispatcher.service $out/etc/systemd/system/dbus-org.freedesktop.nm-dispatcher.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/NetworkManager.service $out/etc/systemd/system/dbus-org.freedesktop.NetworkManager.service ''; meta = with stdenv.lib; { |