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

Merge pull request #1734 from ocharles/network-manager

Browse Source 
NetworkManager: Fix aliases and dependencies
This commit is contained in:
Domen Kožar 2014-02-12 12:35:43 +01:00
commit adf007be2b
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -89,7 +89,7 @@ in {
to change network settings to this group. to change network settings to this group.
''; '';
}; };
packages = mkOption { packages = mkOption {
type = types.listOf types.path; type = types.listOf types.path;
default = [ ]; default = [ ];
@ -178,7 +178,7 @@ in {
description = "NetworkManager initialisation"; description = "NetworkManager initialisation";
wantedBy = [ "network.target" ]; wantedBy = [ "network.target" ];
partOf = [ "NetworkManager.service" ]; partOf = [ "NetworkManager.service" ];
wants = [ "ModemManager.service" ]; wants = [ "ModemManager.service" "NetworkManager.service" ];
before = [ "NetworkManager.service" ]; before = [ "NetworkManager.service" ];
script = '' script = ''
mkdir -m 700 -p /etc/NetworkManager/system-connections mkdir -m 700 -p /etc/NetworkManager/system-connections

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

@ -57,12 +57,14 @@ stdenv.mkDerivation rec {
postInstall = postInstall =
'' ''
mkdir -p $out/lib/NetworkManager mkdir -p $out/lib/NetworkManager
# FIXME: Workaround until NixOS' dbus+systemd supports at_console policy # 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"' 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 # systemd in NixOS doesn't use `systemctl enable`, so we need to establish
mv $out/etc/systemd/system/NetworkManager-dispatcher.service $out/etc/systemd/system/dbus-org.freedesktop.nm-dispatcher.service # 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; { meta = with stdenv.lib; {