#1 Move the NetworkManager dispatcher script out of /etc
Closed 18 days ago by lkundrak. Opened a month ago by lkundrak.
rpms/ lkundrak/tlp lr/nm-dispatcher-dir  into  master

@@ -0,0 +1,29 @@ 

+ From 664b65d293c948a725b9e215c13505539250ce10 Mon Sep 17 00:00:00 2001

+ From: Lubomir Rintel <lkundrak@v3.sk>

+ Date: Thu, 22 Aug 2019 17:37:56 +0200

+ Subject: [PATCH] Move the NetworkManager dispatcher script out of /etc

+ 

+ It's not user configuration and shouldn't ever have been there. Except for that

+ it used to be the only location NetworkManager looked into. With NetworkManager

+ 1.20 that is no longer the case and the dispatcher scripts can be moved to

+ /usr/lib.

+ ---

+  Makefile | 2 +-

+  1 file changed, 1 insertion(+), 1 deletion(-)

+ 

+ diff --git a/Makefile b/Makefile

+ index b540bbe..625ccc7 100644

+ --- a/Makefile

+ +++ b/Makefile

+ @@ -6,7 +6,7 @@ TLP_BIN    ?= /usr/bin

+  TLP_TLIB   ?= /usr/share/tlp

+  TLP_FLIB   ?= /usr/share/tlp/func.d

+  TLP_ULIB   ?= /lib/udev

+ -TLP_NMDSP  ?= /etc/NetworkManager/dispatcher.d

+ +TLP_NMDSP  ?= /usr/lib/NetworkManager/dispatcher.d

+  TLP_CONF   ?= /etc/default/tlp

+  TLP_SYSD   ?= /lib/systemd/system

+  TLP_SYSV   ?= /etc/init.d

+ -- 

+ 2.23.0

+ 

file modified
+7 -3

@@ -1,10 +1,11 @@ 

  Name:           tlp

  Version:        1.2.2

- Release:        2%{?dist}

+ Release:        3%{?dist}

  Summary:        Advanced power management tool for Linux

  License:        GPLv2+

  URL:            http://linrunner.de/en/tlp/tlp.html

  Source0:        https://github.com/linrunner/TLP/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz

+ Patch0:         0001-Move-the-NetworkManager-dispatcher-script-out-of-etc.patch

  #Provided by Andreas Roederer <tlp~at~warpnine~dot~de>:

  Source1:        50-tlp.preset

  

@@ -46,7 +47,7 @@ 

  

  %package rdw

  Summary:        Radio Device Wizard for TLP

- Requires:       NetworkManager

+ Requires:       NetworkManager >= 1.20

  Requires:       %{name} = %{version}-%{release}

  BuildArch:      noarch

  

@@ -101,7 +102,7 @@ 

  %doc COPYING README.md changelog

  %{_bindir}/tlp-rdw

  %{_mandir}/man*/tlp-rdw*

- %{_sysconfdir}/NetworkManager/dispatcher.d/99tlp-rdw-nm

+ %{_prefix}/lib/NetworkManager/dispatcher.d/99tlp-rdw-nm

  %{_udevrulesdir}/85-tlp-rdw.rules

  %{_udevrulesdir}/../tlp-rdw-udev

  %{_datadir}/bash-completion/completions/tlp-rdw

@@ -126,6 +127,9 @@ 

  /bin/systemctl enable NetworkManager-dispatcher.service >/dev/null 2>&1 || :

  

  %changelog

+ * Thu Aug 22 2019 Lubomir Rintel <lkundrak@v3.sk> - 1.2.2-3

+ - Move the NetworkManager dispatcher script out of /etc

+ 

  * Sat Jul 27 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.2-2

  - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild

  

It's not user configuration and shouldn't ever have been there. Except for that
it used to be the only location NetworkManager looked into. With NetworkManager
1.20 that is no longer the case and the dispatcher scripts can be moved to
/usr/lib.

Merging with the provenpackager hat on.

Pull-Request has been closed by lkundrak

18 days ago