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

NetworkManager.service -> network-manager.service

Browse Source
This commit is contained in:
Domen Kožar 2014-11-27 12:09:17 +01:00
parent 53d0b4c539
commit 91bdca38a0
4 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nixos/doc/manual/configuration/network-manager.xml
View File

@ -13,7 +13,7 @@ use NetworkManager. You can enable NetworkManager by setting:
services.networkmanager.enable = true; services.networkmanager.enable = true;
</programlisting> </programlisting>
Some desktop managers (e.g., GNOME) enable NetworkManager some desktop managers (e.g., GNOME) enable NetworkManager
automatically for you.</para> automatically for you.</para>
<para>All users that should have permission to change network settings <para>All users that should have permission to change network settings

6
nixos/doc/manual/installation/installing.xml
View File

@ -25,14 +25,14 @@
run <command>start display-manager</command> to start KDE.</para></listitem> run <command>start display-manager</command> to start KDE.</para></listitem>
<listitem><para>The boot process should have brought up networking (check <listitem><para>The boot process should have brought up networking (check
<command>ifconfig</command>). Networking is necessary for the <command>ip a</command>). Networking is necessary for the
installer, since it will download lots of stuff (such as source installer, since it will download lots of stuff (such as source
tarballs or Nixpkgs channel binaries). It’s best if you have a DHCP tarballs or Nixpkgs channel binaries). It’s best if you have a DHCP
server on your network. Otherwise configure networking manually server on your network. Otherwise configure networking manually
using <command>ifconfig</command>.</para> using <command>ifconfig</command>.</para>
<para>To manually configure the network on the graphical installer, <para>To manually configure the network on the graphical installer,
first disable NetworkManager with first disable network-manager with
<command>stop NetworkManager</command>.</para></listitem> <command>systemctl stop network-manager</command>.</para></listitem>
<listitem><para>The NixOS installer doesn’t do any partitioning or <listitem><para>The NixOS installer doesn’t do any partitioning or
formatting yet, so you need to that yourself. Use the following formatting yet, so you need to that yourself. Use the following

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

@ -177,8 +177,8 @@ in {
systemd.services."networkmanager-init" = { systemd.services."networkmanager-init" = {
description = "NetworkManager initialisation"; description = "NetworkManager initialisation";
wantedBy = [ "network.target" ]; wantedBy = [ "network.target" ];
wants = [ "NetworkManager.service" ]; wants = [ "network-manager.service" ];
before = [ "NetworkManager.service" ]; before = [ "network-manager.service" ];
script = '' script = ''
mkdir -m 700 -p /etc/NetworkManager/system-connections mkdir -m 700 -p /etc/NetworkManager/system-connections
mkdir -m 755 -p ${stateDirs} mkdir -m 755 -p ${stateDirs}
@ -193,7 +193,7 @@ in {
}; };
powerManagement.resumeCommands = '' powerManagement.resumeCommands = ''
systemctl restart NetworkManager Systemctl restart network-manager
''; '';
security.polkit.extraConfig = polkitConf; security.polkit.extraConfig = polkitConf;

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

@ -64,10 +64,14 @@ stdenv.mkDerivation rec {
# 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"'
# rename to network-manager to be in style
mv $out/etc/systemd/system/NetworkManager.service $out/etc/systemd/system/network-manager.service
echo "Alias=NetworkManager.service" >> $out/etc/systemd/system/dbus-org.freedesktop.nm-dispatcher.service
# systemd in NixOS doesn't use `systemctl enable`, so we need to establish # systemd in NixOS doesn't use `systemctl enable`, so we need to establish
# aliases ourselves. # 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-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 ln -s $out/etc/systemd/system/network-manager.service $out/etc/systemd/system/dbus-org.freedesktop.NetworkManager.service
''; '';
meta = with stdenv.lib; { meta = with stdenv.lib; {