Hello Dan Kenigsberg,
I'd like you to do a code review. Please visit
http://gerrit.ovirt.org/24139
to review the following change.
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.
Originally the commit f824941b has added into %files session
the polkit files but on a %else conditional for %0{?rhel} and
this code contains %else for %if 0%{?fedora} >= 18 which won't be EL as expected.
Additionaly, a new commit bae85d50 added %with_systemd macro and triggered
this bug inserting new %if 0%{?rhel}/%else which contains %if 0%{?fedora} >= 18
and %else but won't work too for EL.
Change-Id: I298f21ee6a3e5f2fdf78939ea421a2152490972b
Bug-Url:
https://bugzilla.redhat.com/show_bug.cgi?id=1060524
Signed-off-by: Douglas Schilling Landgraf <dougsland(a)redhat.com>
Reviewed-on:
http://gerrit.ovirt.org/24083
Reviewed-by: Dan Kenigsberg <danken(a)redhat.com>
---
M vdsm.spec.in
1 file changed, 8 insertions(+), 7 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/39/24139/1
diff --git a/vdsm.spec.in b/vdsm.spec.in
index d4ebc43..149793e 100644
--- a/vdsm.spec.in
+++ b/vdsm.spec.in
@@ -656,19 +656,21 @@
# 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
+
+%if !0%{?rhel}
# Install the configuration sample
install -Dm 0644 lib/vdsm/vdsm.conf.sample \
- %{buildroot}%{_sysconfdir}/vdsm/vdsm.conf
+ %{buildroot}%{_sysconfdir}/%{vdsm_name}/vdsm.conf
+%endif
# Install the polkit for libvirt
-%if 0%{?fedora} >= 18
+%if 0%{?fedora} >= 18 || 0%{?rhel} >= 7
install -Dm 0644 vdsm/vdsm-libvirt-access.rules \
%{buildroot}%{_polkitdir}/10-vdsm-libvirt-access.rules
%else
install -Dm 0644 vdsm/vdsm-libvirt-access.pkla \
%{buildroot}%{_polkitdir}/10-vdsm-libvirt-access.pkla
-%endif
%endif
%check
@@ -1086,12 +1088,11 @@
%{_mandir}/man8/vdsmd.8*
%if 0%{?rhel}
%dir %{_localstatedir}/log/core
-%else
-%if 0%{?fedora} >= 18
+%endif
+%if 0%{?fedora} >= 18 || 0%{?rhel} >= 7
%{_polkitdir}/10-vdsm-libvirt-access.rules
%else
%{_polkitdir}/10-vdsm-libvirt-access.pkla
-%endif
%endif
%defattr(-, %{vdsm_user}, %{qemu_group}, -)
--
To view, visit
http://gerrit.ovirt.org/24139
To unsubscribe, visit
http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I298f21ee6a3e5f2fdf78939ea421a2152490972b
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: ovirt-3.4
Gerrit-Owner: Douglas Schilling Landgraf <dougsland(a)redhat.com>
Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com>