From 91bdca38a0867b31eb595e1aa1045cac4e137887 Mon Sep 17 00:00:00 2001
From: Domen Kožar <domen@dev.si>
Date: Thu, 27 Nov 2014 12:09:17 +0100
Subject: NetworkManager.service -> network-manager.service

---
 nixos/doc/manual/configuration/network-manager.xml   | 2 +-
 nixos/doc/manual/installation/installing.xml         | 6 +++---
 nixos/modules/services/networking/networkmanager.nix | 6 +++---
 pkgs/tools/networking/network-manager/default.nix    | 6 +++++-
 4 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/nixos/doc/manual/configuration/network-manager.xml b/nixos/doc/manual/configuration/network-manager.xml
index e65060021b4..ceac40b7a1f 100644
--- a/nixos/doc/manual/configuration/network-manager.xml
+++ b/nixos/doc/manual/configuration/network-manager.xml
@@ -13,7 +13,7 @@ use NetworkManager. You can enable NetworkManager by setting:
 services.networkmanager.enable = true;
 </programlisting>
 
-Some desktop managers (e.g., GNOME) enable NetworkManager
+some desktop managers (e.g., GNOME) enable NetworkManager
 automatically for you.</para>
 
 <para>All users that should have permission to change network settings
diff --git a/nixos/doc/manual/installation/installing.xml b/nixos/doc/manual/installation/installing.xml
index dd1acba2168..c21759bc926 100644
--- a/nixos/doc/manual/installation/installing.xml
+++ b/nixos/doc/manual/installation/installing.xml
@@ -25,14 +25,14 @@
   run <command>start display-manager</command> to start KDE.</para></listitem>
 
   <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
   tarballs or Nixpkgs channel binaries).  It’s best if you have a DHCP
   server on your network. Otherwise configure networking manually
   using <command>ifconfig</command>.</para>
   <para>To manually configure the network on the graphical installer,
-  first disable NetworkManager with
-  <command>stop NetworkManager</command>.</para></listitem>
+  first disable network-manager with
+  <command>systemctl stop network-manager</command>.</para></listitem>
 
   <listitem><para>The NixOS installer doesn’t do any partitioning or
   formatting yet, so you need to that yourself.  Use the following
diff --git a/nixos/modules/services/networking/networkmanager.nix b/nixos/modules/services/networking/networkmanager.nix
index bc1c95d3fd3..39e83e7b427 100644
--- a/nixos/modules/services/networking/networkmanager.nix
+++ b/nixos/modules/services/networking/networkmanager.nix
@@ -177,8 +177,8 @@ in {
     systemd.services."networkmanager-init" = {
       description = "NetworkManager initialisation";
       wantedBy = [ "network.target" ];
-      wants = [ "NetworkManager.service" ];
-      before = [ "NetworkManager.service" ];
+      wants = [ "network-manager.service" ];
+      before = [ "network-manager.service" ];
       script = ''
         mkdir -m 700 -p /etc/NetworkManager/system-connections
         mkdir -m 755 -p ${stateDirs}
@@ -193,7 +193,7 @@ in {
     };
 
     powerManagement.resumeCommands = ''
-      systemctl restart NetworkManager
+      Systemctl restart network-manager
     '';
 
     security.polkit.extraConfig = polkitConf;
diff --git a/pkgs/tools/networking/network-manager/default.nix b/pkgs/tools/networking/network-manager/default.nix
index ea14183ba3c..671f7ec4ff9 100644
--- a/pkgs/tools/networking/network-manager/default.nix
+++ b/pkgs/tools/networking/network-manager/default.nix
@@ -64,10 +64,14 @@ stdenv.mkDerivation rec {
       # 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"'
 
+      # 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
       # 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
+      ln -s $out/etc/systemd/system/network-manager.service $out/etc/systemd/system/dbus-org.freedesktop.NetworkManager.service
     '';
 
   meta = with stdenv.lib; {
-- 
cgit 1.4.1