Slight subject tweak to highlight a patch that might be a good candidate for 1.2.15. Regards, Jim Jim Fehlig wrote: > Commit 198cc1d3 introduced libxl-lockd and libxl-sanlock config > files but forgot to add them to the spec file. Follow-up commit > 62b18d98 added the files to daemon-driver-libxl, but missed adding > them to the daemon package when configuring libvirt > --without-driver-modules. In addition, commit 62b18d98 added > libxl-sanlock to daemon-driver-libxl, but it should be included > in lock-sanlock when libvirt is configured --with-sanlock. > > Signed-off-by: Jim Fehlig <jfehlig(a)suse.com&gt; > --- > > Given the problems I've caused with the original commit 198cc1d3, > I'm reluctant to push this as a build-breaker without another > set of eyes reviewing it. > > libvirt.spec.in | 5 ++++- > 1 file changed, 4 insertions(+), 1 deletion(-) > > diff --git a/libvirt.spec.in b/libvirt.spec.in > index f95e31f..0c343d6 100644 > --- a/libvirt.spec.in > +++ b/libvirt.spec.in > @@ -2007,6 +2007,7 @@ exit 0 > %endif > %if %{with_libxl} > %config(noreplace) %{_sysconfdir}/libvirt/libxl.conf > +%config(noreplace) %{_sysconfdir}/libvirt/libxl-lockd.conf > %dir %attr(0700, root, root) %{_localstatedir}/log/libvirt/libxl/ > %ghost %dir %{_localstatedir}/run/libvirt/libxl/ > %dir %attr(0700, root, root) %{_localstatedir}/lib/libvirt/libxl/ > @@ -2130,7 +2131,6 @@ exit 0 > %defattr(-, root, root) > %config(noreplace) %{_sysconfdir}/libvirt/libxl.conf > %config(noreplace) %{_sysconfdir}/libvirt/libxl-lockd.conf > -%config(noreplace) %{_sysconfdir}/libvirt/libxl-sanlock.conf > %{_datadir}/augeas/lenses/libvirtd_libxl.aug > %{_datadir}/augeas/lenses/tests/test_libvirtd_libxl.aug > %dir %attr(0700, root, root) %{_localstatedir}/log/libvirt/libxl/ > @@ -2183,6 +2183,9 @@ exit 0 > %if %{with_qemu} > %config(noreplace) %{_sysconfdir}/libvirt/qemu-sanlock.conf > %endif > + %if %{with_libxl} > +%config(noreplace) %{_sysconfdir}/libvirt/libxl-sanlock.conf > + %endif > %attr(0755, root, root) %{_libdir}/libvirt/lock-driver/sanlock.so > %{_datadir}/augeas/lenses/libvirt_sanlock.aug > %{_datadir}/augeas/lenses/tests/test_libvirt_sanlock.aug > -- libvir-list mailing list libvir-list(a)redhat.com https://www.redhat.com/mailman/listinfo/libvir-list

Commit 198cc1d3 introduced libxl-lockd and libxl-sanlock config files but forgot to add them to the spec file. Follow-up commit 62b18d98 added the files to daemon-driver-libxl, but missed adding them to the daemon package when configuring libvirt --without-driver-modules. In addition, commit 62b18d98 added libxl-sanlock to daemon-driver-libxl, but it should be included in lock-sanlock when libvirt is configured --with-sanlock. Signed-off-by: Jim Fehlig <jfehlig(a)suse.com&gt; --- Given the problems I've caused with the original commit 198cc1d3, I'm reluctant to push this as a build-breaker without another set of eyes reviewing it. libvirt.spec.in | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libvirt.spec.in b/libvirt.spec.in index f95e31f..0c343d6 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -2007,6 +2007,7 @@ exit 0 %endif %if %{with_libxl}

On 05/29/2015 01:31 AM, Michal Privoznik wrote: > On 01.05.2015 20:56, Jim Fehlig wrote: >> Commit 198cc1d3 introduced libxl-lockd and libxl-sanlock config >> files but forgot to add them to the spec file. Follow-up commit >> 62b18d98 added the files to daemon-driver-libxl, but missed adding >> them to the daemon package when configuring libvirt >> --without-driver-modules. In addition, commit 62b18d98 added >> libxl-sanlock to daemon-driver-libxl, but it should be included >> in lock-sanlock when libvirt is configured --with-sanlock. >> >> Signed-off-by: Jim Fehlig <jfehlig(a)suse.com&gt; >> --- >> >> Given the problems I've caused with the original commit 198cc1d3, >> I'm reluctant to push this as a build-breaker without another >> set of eyes reviewing it. >> >> libvirt.spec.in | 5 ++++- >> 1 file changed, 4 insertions(+), 1 deletion(-) >> >> diff --git a/libvirt.spec.in b/libvirt.spec.in >> index f95e31f..0c343d6 100644 >> --- a/libvirt.spec.in >> +++ b/libvirt.spec.in >> @@ -2007,6 +2007,7 @@ exit 0 >> %endif >> %if %{with_libxl} > ACK and sorry for the delay. No problem. But in the end I think I'll wait until after the release to push this.