Alex Lourie has uploaded a new change for review. Change subject: packaging: Updated packaging for db utilities ......................................................................
packaging: Updated packaging for db utilities This patch updates the packaging of various DB utilities within the setup package. Also, it updates the path to these utilities in the upgrade script. Change-Id: I36c4b03637383860b14c9695aab9ee0afe5bf1a5 Bug-Url: https://bugzilla.redhat.com/893459 Signed-off-by: Alex Lourie <alou...@redhat.com> --- M Makefile M backend/manager/tools/dbutils/fkvalidator.sh M packaging/fedora/setup/basedefs.py M packaging/fedora/spec/ovirt-engine.spec.in 4 files changed, 11 insertions(+), 8 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/07/13107/1 diff --git a/Makefile b/Makefile index 579e59a..2bfbd4c 100644 --- a/Makefile +++ b/Makefile @@ -223,7 +223,7 @@ @install -dm 755 $(DESTDIR)$(DATA_DIR)/db-backups @install -dm 755 $(DESTDIR)$(DATA_DIR)/ovirt-isos @install -dm 755 $(DESTDIR)$(DATA_DIR)/scripts/plugins - @install -dm 755 $(DESTDIR)$(DATA_DIR)/scripts/taskcleaner + @install -dm 755 $(DESTDIR)$(DATA_DIR)/scripts/dbutils @install -dm 755 $(DESTDIR)$(MAN_DIR)/man8 @install -dm 755 $(DESTDIR)$(PYTHON_DIR)/sos/plugins @install -dm 755 $(DESTDIR)$(PKG_SYSCONF_DIR)/engine-config @@ -295,10 +295,12 @@ # Backups folder install -dm 750 $(DESTDIR)$(ENGINE_STATE)/backups - # Task cleaner - install -m 750 backend/manager/tools/dbutils/taskcleaner.sh $(DESTDIR)$(DATA_DIR)/scripts/taskcleaner - install -m 750 backend/manager/tools/dbutils/common.sh $(DESTDIR)$(DATA_DIR)/scripts/taskcleaner - install -m 640 backend/manager/tools/dbutils/taskcleaner_sp.sql $(DESTDIR)$(DATA_DIR)/scripts/taskcleaner + # Task cleaner + install -m 750 backend/manager/tools/dbutils/common.sh $(DESTDIR)$(DATA_DIR)/scripts/dbutils + install -m 750 backend/manager/tools/dbutils/taskcleaner.sh $(DESTDIR)$(DATA_DIR)/scripts/dbutils + install -m 640 backend/manager/tools/dbutils/taskcleaner_sp.sql $(DESTDIR)$(DATA_DIR)/scripts/dbutils + install -m 750 backend/manager/tools/dbutils/fkvalidator.sh $(DESTDIR)$(DATA_DIR)/scripts/dbutils + install -m 640 backend/manager/tools/dbutils/fkvalidator_sp.sql $(DESTDIR)$(DATA_DIR)/scripts/dbutils install_aio_plugin: install -m 755 packaging/fedora/setup/plugins/all_in_one_100.py $(DESTDIR)$(DATA_DIR)/scripts/plugins diff --git a/backend/manager/tools/dbutils/fkvalidator.sh b/backend/manager/tools/dbutils/fkvalidator.sh index 4c74e70..ba7e226 100755 --- a/backend/manager/tools/dbutils/fkvalidator.sh +++ b/backend/manager/tools/dbutils/fkvalidator.sh @@ -1,3 +1,4 @@ +#!/bin/bash ############################################################################################################### # The purpose of this utility is to find inconsistent data that violates FK, display it and enable to remove it # Only support may access this utility with care @@ -18,7 +19,6 @@ # psql:/tmp/tmp.8p8BXKVObk:1: NOTICE: Fixing weather (city) ... (2 records) ############################################################################################################### -#!/bin/bash #include db general functions pushd $(dirname ${0})>/dev/null source ./common.sh diff --git a/packaging/fedora/setup/basedefs.py b/packaging/fedora/setup/basedefs.py index 339b3f5..288b6f8 100644 --- a/packaging/fedora/setup/basedefs.py +++ b/packaging/fedora/setup/basedefs.py @@ -162,7 +162,8 @@ EXEC_SETSEBOOL="/usr/sbin/setsebool" EXEC_SEMANAGE="/usr/sbin/semanage" EXEC_KEYTOOL="/usr/bin/keytool" -EXEC_TASK_CLEANER = "%s/ovirt-engine/scripts/taskcleaner/taskcleaner.sh" % DIR_USR_SHARE +EXEC_TASK_CLEANER = "%s/ovirt-engine/scripts/dbutils/taskcleaner.sh" % DIR_USR_SHARE +EXEC_FKVALIDATOR = "%s/ovirt-engine/scripts/dbutils/fkvalidator.sh" % DIR_USR_SHARE CONST_BASE_MAC_ADDR="00:1A:4A" CONST_DEFAULT_MAC_RANGE="00:1a:4a:16:84:02-00:1a:4a:16:84:fd" diff --git a/packaging/fedora/spec/ovirt-engine.spec.in b/packaging/fedora/spec/ovirt-engine.spec.in index 6ba4973..8cba8d5 100644 --- a/packaging/fedora/spec/ovirt-engine.spec.in +++ b/packaging/fedora/spec/ovirt-engine.spec.in @@ -534,7 +534,7 @@ %{engine_data}/scripts/add_fn_db_get_async_tasks_function.sql # Task Cleaner -%{engine_data}/scripts/taskcleaner +%{engine_data}/scripts/dbutils # Firewalld configuration %config(noreplace) %{_sysconfdir}/firewalld/services/ovirt.xml -- To view, visit http://gerrit.ovirt.org/13107 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I36c4b03637383860b14c9695aab9ee0afe5bf1a5 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Alex Lourie <alou...@redhat.com> _______________________________________________ Engine-patches mailing list Engine-patches@ovirt.org http://lists.ovirt.org/mailman/listinfo/engine-patches
