#6 Move the NetworkManager dispatcher script out of /etc
Closed 21 days ago by lkundrak. Opened a month ago by lkundrak.
rpms/ lkundrak/iscsi-initiator-utils lr/nm-dispatcher-dir  into  master

file modified
+10 -4

@@ -9,7 +9,7 @@ 

  Summary: iSCSI daemon and utility programs

  Name: iscsi-initiator-utils

  Version: 6.%{open_iscsi_version}.%{open_iscsi_build}

- Release: 11.git%{shortcommit0}%{?dist}

+ Release: 12.git%{shortcommit0}%{?dist}

  License: GPLv2+

  URL: http://www.open-iscsi.org

  Source0: https://github.com/open-iscsi/open-iscsi/archive/%{commit0}.tar.gz#/open-iscsi-%{shortcommit0}.tar.gz

@@ -51,6 +51,9 @@ 

  Requires(preun): systemd

  Requires(postun): systemd

  

+ # Old NetworkManager expects the dispatcher scripts in a different place

+ Conflicts: NetworkManager < 1.20

+ 

  %global _hardened_build 1

  %global __provides_exclude_from ^(%{python2_sitearch}/.*\\.so|%{python3_sitearch}/.*\\.so)$

  

@@ -185,8 +188,8 @@ 

  %{__install} -d $RPM_BUILD_ROOT%{_libexecdir}

  %{__install} -pm 755 etc/systemd/iscsi-mark-root-nodes $RPM_BUILD_ROOT%{_libexecdir}

  

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

- %{__install} -pm 755 %{SOURCE4} $RPM_BUILD_ROOT%{_sysconfdir}/NetworkManager/dispatcher.d

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

+ %{__install} -pm 755 %{SOURCE4} $RPM_BUILD_ROOT%{_prefix}/lib/NetworkManager/dispatcher.d

  

  %{__install} -d $RPM_BUILD_ROOT%{_tmpfilesdir}

  %{__install} -pm 644 %{SOURCE5} $RPM_BUILD_ROOT%{_tmpfilesdir}/iscsi.conf

@@ -282,7 +285,7 @@ 

  %{_unitdir}/iscsid.service

  %{_unitdir}/iscsid.socket

  %{_libexecdir}/iscsi-mark-root-nodes

- %{_sysconfdir}/NetworkManager/dispatcher.d/04-iscsi

+ %{_prefix}/lib/NetworkManager

  %{_tmpfilesdir}/iscsi.conf

  %dir %{_sysconfdir}/iscsi

  %attr(0600,root,root) %config(noreplace) %{_sysconfdir}/iscsi/iscsid.conf

@@ -336,6 +339,9 @@ 

  %{python3_sitearch}/*

  

  %changelog

+ * Thu Aug 22 2019 Lubomir Rintel <lkundrak@v3.sk> - 6.2.0.876-12.gitf3c8e90

+ - Move the NetworkManager dispatcher script out of /etc

+ 

  * Mon Aug 19 2019 Miro HronĨok <mhroncok@redhat.com> - 6.2.0.876-11.gitf3c8e90

  - Rebuilt for Python 3.8

  

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

21 days ago