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

Merge pull request #51382 from Mic92/network-manager

Browse Source 
Networkmanager: rename service to match upstream
This commit is contained in:
Florian Klink 2019-03-20 00:49:01 +01:00 committed by GitHub
commit 6a8bc28974
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 19 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -54,7 +54,7 @@
<para> <para>
To manually configure the network on the graphical installer, first disable To manually configure the network on the graphical installer, first disable
network-manager with <command>systemctl stop network-manager</command>. network-manager with <command>systemctl stop NetworkManager</command>.
</para> </para>
<para> <para>

7
nixos/doc/manual/release-notes/rl-1903.xml
View File

@ -216,6 +216,13 @@
<literal>[]</literal>. <literal>[]</literal>.
</para> </para>
</listitem> </listitem>
<listitem>
<para>
The NetworkManager systemd unit was renamed back from network-manager.service to
NetworkManager.service for better compatibility with other applications expecting this name.
The same applies to ModemManager where modem-manager.service is now called ModemManager.service again.
</para>
</listitem>
<listitem> <listitem>
<para> <para>
Package <varname>rabbitmq_server</varname> is renamed to Package <varname>rabbitmq_server</varname> is renamed to

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

@ -466,7 +466,7 @@ in {
systemd.packages = cfg.packages; systemd.packages = cfg.packages;
systemd.services."network-manager" = { systemd.services."NetworkManager" = {
wantedBy = [ "network.target" ]; wantedBy = [ "network.target" ];
restartTriggers = [ configFile ]; restartTriggers = [ configFile ];
@ -478,9 +478,9 @@ in {
}; };
systemd.services.nm-setup-hostsdirs = mkIf dynamicHostsEnabled { systemd.services.nm-setup-hostsdirs = mkIf dynamicHostsEnabled {
wantedBy = [ "network-manager.service" ]; wantedBy = [ "NetworkManager.service" ];
before = [ "network-manager.service" ]; before = [ "NetworkManager.service" ];
partOf = [ "network-manager.service" ]; partOf = [ "NetworkManager.service" ];
script = concatStrings (mapAttrsToList (n: d: '' script = concatStrings (mapAttrsToList (n: d: ''
mkdir -p "/run/NetworkManager/hostsdirs/${n}" mkdir -p "/run/NetworkManager/hostsdirs/${n}"
chown "${d.user}:${d.group}" "/run/NetworkManager/hostsdirs/${n}" chown "${d.user}:${d.group}" "/run/NetworkManager/hostsdirs/${n}"

5
pkgs/tools/networking/modem-manager/default.nix
View File

@ -33,12 +33,9 @@ stdenv.mkDerivation rec {
doCheck = true; doCheck = true;
postInstall = '' postInstall = ''
# rename to modem-manager to be in style
mv $out/etc/systemd/system/ModemManager.service $out/etc/systemd/system/modem-manager.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/modem-manager.service \ ln -s $out/etc/systemd/system/ModemManager.service \
$out/etc/systemd/system/dbus-org.freedesktop.ModemManager1.service $out/etc/systemd/system/dbus-org.freedesktop.ModemManager1.service
''; '';

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

@ -88,13 +88,15 @@ in 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
# 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/network-manager.service $out/etc/systemd/system/dbus-org.freedesktop.NetworkManager.service ln -s $out/etc/systemd/system/NetworkManager.service $out/etc/systemd/system/dbus-org.freedesktop.NetworkManager.service
# Add the legacy service name from before #51382 to prevent NetworkManager
# from not starting back up:
# TODO: remove this once 19.10 is released
ln -s $out/etc/systemd/system/NetworkManager.service $out/etc/systemd/system/network-manager.service
''; '';
passthru = { passthru = {