midnight
From Dan Kenigsberg <danken(a)redhat.com>:
Dan Kenigsberg has uploaded a new change for review.
Change subject: spec: move polkit rules location logic to automake
......................................................................
spec: move polkit rules location logic to automake
Change-Id: Ia16538d01fb5763095ce429238ca9489dd5eefdf
Signed-off-by: Dan Kenigsberg <danken(a)redhat.com>
---
M configure.ac
M static/Makefile.am
R static/usr/share/polkit-1/rules.d/10-vdsm-libvirt-access.rules
M vdsm.spec.in
M vdsm/Makefile.am
5 files changed, 12 insertions(+), 6 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/51/78551/1
diff --git a/configure.ac b/configure.ac
index 3cd046b..e99d311 100644
--- a/configure.ac
+++ b/configure.ac
@@ -247,6 +247,14 @@
[with_data_center="/rhev/data-center"])
AC_SUBST([vdsmrepo], [${with_data_center}])
+AC_ARG_WITH(
+ [polkitdir],
+ [AS_HELP_STRING([--with-polkitdir=FILE],
+ [where to place polkit rules,
@<:@default=/usr/share/polkit-1/rules.d@:>@])],
+ [with_polkitdir="${withval}"],
+ [with_polkitdir="/usr/share/polkit-1/rules.d"])
+AC_SUBST([polkitdir], [${with_polkitdir}])
+
# Users and groups
AC_SUBST([VDSMUSER], [vdsm])
AC_SUBST([VDSMGROUP], [kvm])
diff --git a/static/Makefile.am b/static/Makefile.am
index 85414e5..bd82a60 100644
--- a/static/Makefile.am
+++ b/static/Makefile.am
@@ -111,6 +111,8 @@
libvirtpassworddir = $(vdsmtsdir)/keys
libvirtpassword_DATA = ./$(libvirtpassworddir)/libvirt_password
+dist_polkit_SCRIPTS = \
+ ./usr/share/polkit-1/rules.d/10-vdsm-libvirt-access.rules
cronhourlydir = $(sysconfdir)/cron.hourly
dist_cronhourly_SCRIPTS = \
diff --git a/vdsm/vdsm-libvirt-access.rules
b/static/usr/share/polkit-1/rules.d/10-vdsm-libvirt-access.rules
similarity index 100%
rename from vdsm/vdsm-libvirt-access.rules
rename to static/usr/share/polkit-1/rules.d/10-vdsm-libvirt-access.rules
diff --git a/vdsm.spec.in b/vdsm.spec.in
index 368dc59..fc18c57 100644
--- a/vdsm.spec.in
+++ b/vdsm.spec.in
@@ -709,7 +709,8 @@
%if 0%{?with_containers}
--enable-containers \
%endif
- --with-data-center='@VDSMREPO@'
+ --with-data-center='@VDSMREPO@' \
+ --with-polkitdir=%{_polkitdir}
make
# Setting software_version and software_revision in dsaversion.py
@@ -751,10 +752,6 @@
# dropbox for core dumps
install -dDm 1777 %{buildroot}%{_localstatedir}/log/core
%endif
-
-# Install the polkit for libvirt
-install -Dm 0644 vdsm/vdsm-libvirt-access.rules \
- %{buildroot}%{_polkitdir}/10-vdsm-libvirt-access.rules
# Install the libvirt hook for cleaning up the XML
install -Dm 0755 vdsm/virt/libvirt-hook.sh \
diff --git a/vdsm/Makefile.am b/vdsm/Makefile.am
index 3675e3b..b36f56e 100644
--- a/vdsm/Makefile.am
+++ b/vdsm/Makefile.am
@@ -53,7 +53,6 @@
mk_sysprep_floppy.in \
vdsm-gencerts.sh.in \
vdsm-libvirt-access.pkla \
- vdsm-libvirt-access.rules \
$(NULL)
all-local: \
--
To view, visit https://gerrit.ovirt.org/78551
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia16538d01fb5763095ce429238ca9489dd5eefdf
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Dan Kenigsberg <danken(a)redhat.com>
4:52 p.m.
From Dan Kenigsberg <danken(a)redhat.com>:
Dan Kenigsberg has posted comments on this change.
Change subject: spec: move polkit rules location logic to automake
......................................................................
Patch Set 3:
ci please build
--
To view, visit https://gerrit.ovirt.org/78551
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: Ia16538d01fb5763095ce429238ca9489dd5eefdf
Gerrit-PatchSet: 3
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Dan Kenigsberg <danken(a)redhat.com>
Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com>
Gerrit-Reviewer: Francesco Romani <fromani(a)redhat.com>
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: Piotr Kliczewski <piotr.kliczewski(a)gmail.com>
Gerrit-Reviewer: gerrit-hooks <automation(a)ovirt.org>
Gerrit-HasComments: No
4:55 p.m.
From Dan Kenigsberg <danken(a)redhat.com>:
Dan Kenigsberg has posted comments on this change.
Change subject: spec: move polkit rules location logic to automake
......................................................................
Patch Set 3:
OST tests el7
oVirt%20system%20tests/job/ovirt-system-tests_manual
--
To view, visit https://gerrit.ovirt.org/78551
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: Ia16538d01fb5763095ce429238ca9489dd5eefdf
Gerrit-PatchSet: 3
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Dan Kenigsberg <danken(a)redhat.com>
Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com>
Gerrit-Reviewer: Francesco Romani <fromani(a)redhat.com>
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: Piotr Kliczewski <piotr.kliczewski(a)gmail.com>
Gerrit-Reviewer: gerrit-hooks <automation(a)ovirt.org>
Gerrit-HasComments: No
5 p.m.
From Dan Kenigsberg <danken(a)redhat.com>:
Dan Kenigsberg has posted comments on this change.
Change subject: spec: move polkit rules location logic to automake
......................................................................
Patch Set 3: Continuous-Integration+1
Fat finger
--
To view, visit https://gerrit.ovirt.org/78551
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: Ia16538d01fb5763095ce429238ca9489dd5eefdf
Gerrit-PatchSet: 3
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Dan Kenigsberg <danken(a)redhat.com>
Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com>
Gerrit-Reviewer: Francesco Romani <fromani(a)redhat.com>
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: Piotr Kliczewski <piotr.kliczewski(a)gmail.com>
Gerrit-Reviewer: gerrit-hooks <automation(a)ovirt.org>
Gerrit-HasComments: No
4:17 a.m.
From Dan Kenigsberg <danken(a)redhat.com>:
Dan Kenigsberg has posted comments on this change.
Change subject: spec: move polkit rules location logic to automake
......................................................................
Patch Set 3:
http://jenkins.ovirt.org/view/oVirt%20system%20tests/job/ovirt-system-tes... for
el7
--
To view, visit https://gerrit.ovirt.org/78551
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: Ia16538d01fb5763095ce429238ca9489dd5eefdf
Gerrit-PatchSet: 3
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Dan Kenigsberg <danken(a)redhat.com>
Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com>
Gerrit-Reviewer: Francesco Romani <fromani(a)redhat.com>
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: Piotr Kliczewski <piotr.kliczewski(a)gmail.com>
Gerrit-Reviewer: gerrit-hooks <automation(a)ovirt.org>
Gerrit-HasComments: No
10:31 a.m.
From Dan Kenigsberg <danken(a)redhat.com>:
Dan Kenigsberg has posted comments on this change.
Change subject: spec: move polkit rules location logic to automake
......................................................................
Patch Set 5: Verified+1
OST passing on el7, no change in rpm for f25.
--
To view, visit https://gerrit.ovirt.org/78551
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: Ia16538d01fb5763095ce429238ca9489dd5eefdf
Gerrit-PatchSet: 5
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Dan Kenigsberg <danken(a)redhat.com>
Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com>
Gerrit-Reviewer: Francesco Romani <fromani(a)redhat.com>
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: Piotr Kliczewski <piotr.kliczewski(a)gmail.com>
Gerrit-Reviewer: gerrit-hooks <automation(a)ovirt.org>
Gerrit-HasComments: No
4:42 p.m.
From Dan Kenigsberg <danken(a)redhat.com>:
Dan Kenigsberg has posted comments on this change.
Change subject: spec: move polkit rules location logic to automake
......................................................................
Patch Set 6: Verified+1
no change in /usr/share/polkit-1/rules.d/10-vdsm-libvirt-access.rules location.
--
To view, visit https://gerrit.ovirt.org/78551
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: Ia16538d01fb5763095ce429238ca9489dd5eefdf
Gerrit-PatchSet: 6
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Dan Kenigsberg <danken(a)redhat.com>
Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com>
Gerrit-Reviewer: Francesco Romani <fromani(a)redhat.com>
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: Piotr Kliczewski <piotr.kliczewski(a)gmail.com>
Gerrit-Reviewer: gerrit-hooks <automation(a)ovirt.org>
Gerrit-HasComments: No
2:03 a.m.
From Dan Kenigsberg <danken(a)redhat.com>:
Dan Kenigsberg has submitted this change and it was merged. (
https://gerrit.ovirt.org/78551 )
Change subject: spec: move polkit rules location logic to automake
......................................................................
spec: move polkit rules location logic to automake
Change-Id: Ia16538d01fb5763095ce429238ca9489dd5eefdf
Signed-off-by: Dan Kenigsberg <danken(a)redhat.com>
---
M configure.ac
M static/Makefile.am
R static/usr/share/polkit-1/rules.d/10-vdsm-libvirt-access.rules
M vdsm.spec.in
M vdsm/Makefile.am
5 files changed, 14 insertions(+), 6 deletions(-)
Approvals:
Piotr Kliczewski: Looks good to me, but someone else must approve
Jenkins CI: Passed CI tests
Dan Kenigsberg: Verified
Francesco Romani: Looks good to me, approved
--
To view, visit https://gerrit.ovirt.org/78551
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ia16538d01fb5763095ce429238ca9489dd5eefdf
Gerrit-PatchSet: 7
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Dan Kenigsberg <danken(a)redhat.com>
Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com>
Gerrit-Reviewer: Francesco Romani <fromani(a)redhat.com>
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: Piotr Kliczewski <piotr.kliczewski(a)gmail.com>
Gerrit-Reviewer: gerrit-hooks <automation(a)ovirt.org>
2273
days inactive
2281
days old
vdsm-patches@lists.fedorahosted.org
7 comments
1 participants
participants (1)
-
Code Review