Douglas Schilling Landgraf has uploaded a new change for review.
Change subject: spec: vdsm pkg for EL distro must include pkla
......................................................................
spec: vdsm pkg for EL distro must include pkla
vdsm on EL system should ship the .pkla file or libvirt will
keep asking password and vdsm won't be able to start correctly.
Change-Id: I298f21ee6a3e5f2fdf78939ea421a2152490972b
Bug-Url:
https://bugzilla.redhat.com/show_bug.cgi?id=1060524
Signed-off-by: Douglas Schilling Landgraf <dougsland(a)redhat.com>
---
M vdsm.spec.in
1 file changed, 5 insertions(+), 8 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/83/24083/1
diff --git a/vdsm.spec.in b/vdsm.spec.in
index d4ebc43..7f59f5f 100644
--- a/vdsm.spec.in
+++ b/vdsm.spec.in
@@ -656,10 +656,11 @@
# This is not commonplace, but we want /var/log/core to be a world-writable
# dropbox for core dumps
install -dDm 1777 %{buildroot}%{_localstatedir}/log/core
-%else
+%endif
+
# Install the configuration sample
install -Dm 0644 lib/vdsm/vdsm.conf.sample \
- %{buildroot}%{_sysconfdir}/vdsm/vdsm.conf
+ %{buildroot}%{_sysconfdir}/%{vdsm_name}/vdsm.conf
# Install the polkit for libvirt
%if 0%{?fedora} >= 18
@@ -668,7 +669,6 @@
%else
install -Dm 0644 vdsm/vdsm-libvirt-access.pkla \
%{buildroot}%{_polkitdir}/10-vdsm-libvirt-access.pkla
-%endif
%endif
%check
@@ -928,6 +928,7 @@
%{_datadir}/%{vdsm_name}/vdsm-store-net-config
%{_datadir}/%{vdsm_name}/vm.py*
+%config(noreplace) %{_sysconfdir}/%{vdsm_name}/vdsm.conf
%config(noreplace) %{_sysconfdir}/%{vdsm_name}/logger.conf
%config(noreplace) %{_sysconfdir}/%{vdsm_name}/svdsm.logger.conf
%config(noreplace) %{_sysconfdir}/%{vdsm_name}/upgrade.logger.conf
@@ -1086,12 +1087,11 @@
%{_mandir}/man8/vdsmd.8*
%if 0%{?rhel}
%dir %{_localstatedir}/log/core
-%else
+%endif
%if 0%{?fedora} >= 18
%{_polkitdir}/10-vdsm-libvirt-access.rules
%else
%{_polkitdir}/10-vdsm-libvirt-access.pkla
-%endif
%endif
%defattr(-, %{vdsm_user}, %{qemu_group}, -)
@@ -1117,9 +1117,6 @@
%files python
%defattr(-, root, root, -)
%{_bindir}/vdsm-tool
-%if !0%{?rhel}
-%config(noreplace) %{_sysconfdir}/%{vdsm_name}/vdsm.conf
-%endif
%dir %{python_sitearch}/%{vdsm_name}
%dir %{python_sitearch}/%{vdsm_name}/tool
%{python_sitearch}/%{vdsm_name}/__init__.py*
--
To view, visit
http://gerrit.ovirt.org/24083
To unsubscribe, visit
http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I298f21ee6a3e5f2fdf78939ea421a2152490972b
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Douglas Schilling Landgraf <dougsland(a)redhat.com>