Просмотр исходного кода

Move corosync-notifyd policy file into $(datadir)/dbus-1/system.d

As per dbus-daemon(1):

> Third-party packages would historically install XML files into
> /etc/dbus-1/system.d, but this practice is now considered to be
> deprecated: that directory should be treated as reserved for the
> system administrator.

Signed-off-by: Ferenc Wágner <wferi@debian.org>
Reviewed-by: Jan Friesse <jfriesse@redhat.com>
Ferenc Wágner 1 год назад
Родитель
Сommit
6009018151
2 измененных файлов с 3 добавлено и 3 удалено
  1. 1 1
      conf/Makefile.am
  2. 2 2
      corosync.spec.in

+ 1 - 1
conf/Makefile.am

@@ -60,7 +60,7 @@ mib_DATA		= COROSYNC-MIB.txt
 endif
 
 if INSTALL_DBUSCONF
-dbusdir			= $(sysconfdir)/dbus-1/system.d
+dbusdir			= $(datadir)/dbus-1/system.d
 dbus_DATA		= corosync-signals.conf
 endif
 

+ 2 - 2
corosync.spec.in

@@ -126,7 +126,7 @@ make install DESTDIR=%{buildroot}
 
 %if %{with dbus}
 mkdir -p -m 0700 %{buildroot}/%{_sysconfdir}/dbus-1/system.d
-install -m 644 %{_builddir}/%{name}-%{version}%{?gittarver}/conf/corosync-signals.conf %{buildroot}/%{_sysconfdir}/dbus-1/system.d/corosync-signals.conf
+install -m 644 %{_builddir}/%{name}-%{version}%{?gittarver}/conf/corosync-signals.conf %{buildroot}/%{_datadir}/dbus-1/system.d/corosync-signals.conf
 %endif
 
 ## tree fixup
@@ -195,7 +195,7 @@ fi
 %config(noreplace) %{_sysconfdir}/sysconfig/corosync
 %config(noreplace) %{_sysconfdir}/logrotate.d/corosync
 %if %{with dbus}
-%{_sysconfdir}/dbus-1/system.d/corosync-signals.conf
+%{_datadir}/dbus-1/system.d/corosync-signals.conf
 %endif
 %if %{with snmp}
 %{_datadir}/snmp/mibs/COROSYNC-MIB.txt