Skip to content

Commit

Permalink
dbus: install config in /usr (bsc#1183407,jsc#SLE-9750)
Browse files Browse the repository at this point in the history
As a system service, wicked should install the bus config in
/usr/share/dbus-1/system.d instead in /etc/dbus-1/system.d
on more recent SUSE systems. Guarded to >= 15.5 code base
as in jsc#SLE-9750, that is effective on Tumbleweed now.
  • Loading branch information
mtomaschewski committed Oct 1, 2021
1 parent 0c96bee commit 6471a60
Showing 1 changed file with 15 additions and 7 deletions.
22 changes: 15 additions & 7 deletions wicked.spec.in
Expand Up @@ -114,6 +114,11 @@ PreReq: %fillup_prereq %insserv_prereq
%define wicked_statedir %_localstatedir/run/%{name}
%endif
%define wicked_storedir %_localstatedir/lib/%{name}
%if 0%{?suse_version} >= 1550
%define dbus_config_base %_datadir/dbus-1
%else
%define dbus_config_base %_sysconfdir/dbus-1
%endif

%description
Wicked is a network configuration infrastructure incorporating a number
Expand Down Expand Up @@ -205,6 +210,7 @@ export CFLAGS="-std=gnu89 $RPM_OPT_FLAGS"
%if ! %{with dbusstart}
--without-dbus-servicedir \
%endif
--with-dbus-configdir=%{dbus_config_base}/system.d \
--disable-static
make %{?_smp_mflags}

Expand Down Expand Up @@ -333,16 +339,18 @@ fi
%dir %_sysconfdir/wicked/extensions
%config(noreplace) %_sysconfdir/wicked/extensions/*
%dir %_sysconfdir/wicked/ifconfig
%dir %_sysconfdir/dbus-1
%dir %_sysconfdir/dbus-1/system.d
%dir %{dbus_config_base}
%dir %{dbus_config_base}/system.d
# mark the policies as config to keep backup, but replace on upgrade
%config %_sysconfdir/dbus-1/system.d/org.opensuse.Network.conf
%config %_sysconfdir/dbus-1/system.d/org.opensuse.Network.AUTO4.conf
%config %_sysconfdir/dbus-1/system.d/org.opensuse.Network.DHCP4.conf
%config %_sysconfdir/dbus-1/system.d/org.opensuse.Network.DHCP6.conf
%config %_sysconfdir/dbus-1/system.d/org.opensuse.Network.Nanny.conf
%config %{dbus_config_base}/system.d/org.opensuse.Network.conf
%config %{dbus_config_base}/system.d/org.opensuse.Network.AUTO4.conf
%config %{dbus_config_base}/system.d/org.opensuse.Network.DHCP4.conf
%config %{dbus_config_base}/system.d/org.opensuse.Network.DHCP6.conf
%config %{dbus_config_base}/system.d/org.opensuse.Network.Nanny.conf
%if %{with dbusstart}
%if "%dbus_config_base" != "%_datadir/dbus-1"
%dir %_datadir/dbus-1
%endif
%dir %_datadir/dbus-1/system-services
%_datadir/dbus-1/system-services/org.opensuse.Network.*.service
%endif
Expand Down

0 comments on commit 6471a60

Please sign in to comment.