#2 Move the NetworkManager dispatcher script out of /etc
Merged 2 months ago by pbrobinson. Opened 2 months ago by lkundrak.
rpms/ lkundrak/olpc-update lr/nm-dispatcher-dir  into  master

file modified
+9 -5

@@ -1,6 +1,6 @@ 

  Name:		olpc-update

  Version:	2.29

- Release:	12%{?dist}

+ Release:	13%{?dist}

  Summary:	OLPC system update tools

  

  License:	GPLv2+

@@ -8,7 +8,8 @@ 

  Source0:	http://dev.laptop.org/~dsd/olpc-update/%{name}-%{version}.tar.bz2

  BuildArch:	noarch

  

- Requires:	bitfrost, olpc-contents, NetworkManager

+ Requires:	bitfrost, olpc-contents

+ Requires:	NetworkManager >= 1.20

  Requires(post): systemd

  Requires(preun): systemd

  Requires(postun): systemd

@@ -34,13 +35,13 @@ 

  %install

  mkdir -p $RPM_BUILD_ROOT/%{_sbindir}

  mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/cron.d

- mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/NetworkManager/dispatcher.d

+ mkdir -p $RPM_BUILD_ROOT/%{_prefix}/lib/NetworkManager/dispatcher.d

  

  install -m 755 olpc-update-query olpc-update $RPM_BUILD_ROOT/%{_sbindir}

  install -m 755 irsync $RPM_BUILD_ROOT/%{_sbindir}/olpc-incr-rsync

  install -d $RPM_BUILD_ROOT/%{_unitdir}

  install -m 644 olpc-update-query.{timer,service} $RPM_BUILD_ROOT/%{_unitdir}

- install -m 755 olpc-update-ifup $RPM_BUILD_ROOT/%{_sysconfdir}/NetworkManager/dispatcher.d/olpc-update-ifup

+ install -m 755 olpc-update-ifup $RPM_BUILD_ROOT/%{_prefix}/lib/NetworkManager/dispatcher.d/olpc-update-ifup

  

  

  %post

@@ -62,10 +63,13 @@ 

  %{_sbindir}/olpc-update

  %{_sbindir}/olpc-incr-rsync

  %{_unitdir}/*

- %{_sysconfdir}/NetworkManager/dispatcher.d/olpc-update-ifup

+ %{_prefix}/lib/NetworkManager/dispatcher.d/olpc-update-ifup

  

  

  %changelog

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

+ - Move the NetworkManager dispatcher script out of /etc

+ 

  * Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2.29-12

  - 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.

Pull-Request has been merged by pbrobinson

2 months ago
Metadata