From f8c734572c3157a8a5e69871e6ed5e31ca178f7a Mon Sep 17 00:00:00 2001 From: Andrea Bolognani Date: Mon, 27 May 2019 12:56:04 +0200 Subject: [PATCH] spec: Improve handling for default network This is exactly how we already treat nwfilters, which require the same kind of care (aka nasty hacks) as the default network, because in both cases the UUID is generated and written to disk the first time libvirtd is started after installing the corresponding subpackage. After this patch, RPM will be aware of the fact that the libvirt-daemon-config-network subpackage owns the default network. Signed-off-by: Andrea Bolognani Acked-by: Michal Privoznik --- libvirt.spec.in | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/libvirt.spec.in b/libvirt.spec.in index dc69920d75..78b7f43934 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -1250,8 +1250,8 @@ install -d -m 0755 $RPM_BUILD_ROOT%{_datadir}/lib/libvirt/dnsmasq/ install -d -m 0755 $RPM_BUILD_ROOT%{_datadir}/libvirt/networks/ cp $RPM_BUILD_ROOT%{_sysconfdir}/libvirt/qemu/networks/default.xml \ $RPM_BUILD_ROOT%{_datadir}/libvirt/networks/default.xml -rm -f $RPM_BUILD_ROOT%{_sysconfdir}/libvirt/qemu/networks/default.xml -rm -f $RPM_BUILD_ROOT%{_sysconfdir}/libvirt/qemu/networks/autostart/default.xml +# libvirt saves this file with mode 0600 +chmod 0600 $RPM_BUILD_ROOT%{_sysconfdir}/libvirt/qemu/networks/default.xml # nwfilter files are installed in /usr/share/libvirt and copied to /etc in %post # to avoid verification errors on changed files in /etc @@ -1427,6 +1427,8 @@ if test $1 -eq 1 && test ! -f %{_sysconfdir}/libvirt/qemu/networks/default.xml ; < %{_datadir}/libvirt/networks/default.xml \ > %{_sysconfdir}/libvirt/qemu/networks/default.xml ln -s ../default.xml %{_sysconfdir}/libvirt/qemu/networks/autostart/default.xml + # libvirt saves this file with mode 0600 + chmod 0600 %{_sysconfdir}/libvirt/qemu/networks/default.xml # Make sure libvirt picks up the new network defininiton mkdir -p %{_localstatedir}/lib/rpm-state/libvirt || : @@ -1571,6 +1573,8 @@ exit 0 %files daemon-config-network %dir %{_datadir}/libvirt/networks/ %{_datadir}/libvirt/networks/default.xml +%ghost %{_sysconfdir}/libvirt/qemu/networks/default.xml +%ghost %{_sysconfdir}/libvirt/qemu/networks/autostart/default.xml %files daemon-config-nwfilter %dir %{_datadir}/libvirt/nwfilter/