From Dan Kenigsberg <danken(a)redhat.com>:
Dan Kenigsberg has uploaded a new change for review.
Change subject: place [gs]et-conf-item scripts under libexec
......................................................................
place [gs]et-conf-item scripts under libexec
These are helper scripts used only by vdsm startup script
Change-Id: I983bdca05df8c66e594211243fb99327c9c3d250
Signed-off-by: Dan Kenigsberg <danken(a)redhat.com>
---
M init/vdsmd_init_common.sh.in
M static/Makefile.am
R static/libexec/vdsm/get-conf-item
R static/libexec/vdsm/set-conf-item
M tox.ini
M vdsm.spec.in
M vdsm/Makefile.am
7 files changed, 11 insertions(+), 7 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/50/78550/1
diff --git a/init/vdsmd_init_common.sh.in b/init/vdsmd_init_common.sh.in
index 4e50ecb..2a6f5c3 100755
--- a/init/vdsmd_init_common.sh.in
+++ b/init/vdsmd_init_common.sh.in
@@ -109,7 +109,7 @@
_CONF_FILE="@CONFDIR(a)/vdsm.conf"
-_GETCONFITEM="@VDSMDIR@/get-conf-item"
+_GETCONFITEM="@LIBEXECDIR@/get-conf-item"
_DOM_METADATA_BACKUP_DIR="@VDSMLOGDIR@/backup"
_mk_data_center() {
diff --git a/static/Makefile.am b/static/Makefile.am
index 1ad329e..85414e5 100644
--- a/static/Makefile.am
+++ b/static/Makefile.am
@@ -111,11 +111,17 @@
libvirtpassworddir = $(vdsmtsdir)/keys
libvirtpassword_DATA = ./$(libvirtpassworddir)/libvirt_password
+
cronhourlydir = $(sysconfdir)/cron.hourly
dist_cronhourly_SCRIPTS = \
./etc/cron.hourly/vdsm-logrotate \
$(NULL)
+dist_vdsmexec_SCRIPTS = \
+ ./libexec/vdsm/get-conf-item \
+ ./libexec/vdsm/set-conf-item \
+ $(NULL)
+
networkmanagerdir = $(sysconfdir)/NetworkManager/conf.d
networkmanager_DATA = \
diff --git a/vdsm/get-conf-item b/static/libexec/vdsm/get-conf-item
similarity index 100%
rename from vdsm/get-conf-item
rename to static/libexec/vdsm/get-conf-item
diff --git a/vdsm/set-conf-item b/static/libexec/vdsm/set-conf-item
similarity index 100%
rename from vdsm/set-conf-item
rename to static/libexec/vdsm/set-conf-item
diff --git a/tox.ini b/tox.ini
index ce405b9..a69e06b 100644
--- a/tox.ini
+++ b/tox.ini
@@ -52,8 +52,8 @@
init/daemonAdapter \
lib/vdsm/storage/curl-img-wrap \
lib/vdsm/storage/fc-scan \
- vdsm/get-conf-item \
- vdsm/set-conf-item
+ static/libexec/vdsm/get-conf-item \
+ static/libexec/vdsm/set-conf-item
[flake8]
diff --git a/vdsm.spec.in b/vdsm.spec.in
index 3210c8f..368dc59 100644
--- a/vdsm.spec.in
+++ b/vdsm.spec.in
@@ -985,8 +985,8 @@
%dir %{_libexecdir}/%{vdsm_name}/hooks/before_ifcfg_write
%dir %{_libexecdir}/%{vdsm_name}/hooks/after_ifcfg_write
-%{_datadir}/%{vdsm_name}/get-conf-item
-%{_datadir}/%{vdsm_name}/set-conf-item
+%{_libexecdir}/%{vdsm_name}/get-conf-item
+%{_libexecdir}/%{vdsm_name}/set-conf-item
%{python_sitelib}/sos/plugins/vdsm.py*
%{_udevrulesdir}/12-vdsm-lvm.rules
/etc/security/limits.d/99-vdsm.conf
diff --git a/vdsm/Makefile.am b/vdsm/Makefile.am
index 6d42a5c..3675e3b 100644
--- a/vdsm/Makefile.am
+++ b/vdsm/Makefile.am
@@ -38,8 +38,6 @@
mk_sysprep_floppy
dist_vdsm_SCRIPTS = \
- get-conf-item \
- set-conf-item \
vdsmd \
$(NULL)
--
To view, visit
https://gerrit.ovirt.org/78550
To unsubscribe, visit
https://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I983bdca05df8c66e594211243fb99327c9c3d250
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Dan Kenigsberg <danken(a)redhat.com>