cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From raj...@apache.org
Subject [1/3] git commit: updated refs/heads/master to 1decf53
Date Wed, 15 Mar 2017 05:22:29 GMT
Repository: cloudstack
Updated Branches:
  refs/heads/master ad7ed7a17 -> 1decf5366


CLOUDSTACK-9765: centos: packaging: fix missing path in spec file post install


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/bcc6b4fb
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/bcc6b4fb
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/bcc6b4fb

Branch: refs/heads/master
Commit: bcc6b4fbaf74865b971a72122d15d5bfde4ab7ba
Parents: 8b6e96b
Author: Rene Moser <resmo@apache.org>
Authored: Tue Jan 31 18:15:12 2017 +0100
Committer: Rene Moser <resmo@apache.org>
Committed: Thu Feb 2 15:56:55 2017 +0100

----------------------------------------------------------------------
 packaging/centos63/cloud.spec | 2 +-
 packaging/centos7/cloud.spec  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/bcc6b4fb/packaging/centos63/cloud.spec
----------------------------------------------------------------------
diff --git a/packaging/centos63/cloud.spec b/packaging/centos63/cloud.spec
index 9556236..87a60c3 100644
--- a/packaging/centos63/cloud.spec
+++ b/packaging/centos63/cloud.spec
@@ -440,7 +440,7 @@ if [ "$1" == "1" ] ; then
 fi
 
 grep -s -q "db.cloud.driver=jdbc:mysql" "%{_sysconfdir}/%{name}/management/db.properties"
|| sed -i -e "\$adb.cloud.driver=jdbc:mysql" "%{_sysconfdir}/%{name}/management/db.properties"
-grep -s -q "db.usage.driver=jdbc:mysql" "%{_sysconfdir}/%{name}/management/db.properties"
|| sed -i -e "\$adb.usage.driver=jdbc:mysql" db.properties
+grep -s -q "db.usage.driver=jdbc:mysql" "%{_sysconfdir}/%{name}/management/db.properties"
|| sed -i -e "\$adb.usage.driver=jdbc:mysql" "%{_sysconfdir}/%{name}/management/db.properties"
 grep -s -q "db.simulator.driver=jdbc:mysql" "%{_sysconfdir}/%{name}/management/db.properties"
|| sed -i -e "\$adb.simulator.driver=jdbc:mysql" "%{_sysconfdir}/%{name}/management/db.properties"
 
 if [ ! -f %{_datadir}/cloudstack-common/scripts/vm/hypervisor/xenserver/vhd-util ] ; then

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/bcc6b4fb/packaging/centos7/cloud.spec
----------------------------------------------------------------------
diff --git a/packaging/centos7/cloud.spec b/packaging/centos7/cloud.spec
index 7c093f9..74f60e7 100644
--- a/packaging/centos7/cloud.spec
+++ b/packaging/centos7/cloud.spec
@@ -397,7 +397,7 @@ if [ "$1" == "1" ] ; then
 fi
 
 grep -s -q "db.cloud.driver=jdbc:mysql" "%{_sysconfdir}/%{name}/management/db.properties"
|| sed -i -e "\$adb.cloud.driver=jdbc:mysql" "%{_sysconfdir}/%{name}/management/db.properties"
-grep -s -q "db.usage.driver=jdbc:mysql" "%{_sysconfdir}/%{name}/management/db.properties"
|| sed -i -e "\$adb.usage.driver=jdbc:mysql" db.properties
+grep -s -q "db.usage.driver=jdbc:mysql" "%{_sysconfdir}/%{name}/management/db.properties"
|| sed -i -e "\$adb.usage.driver=jdbc:mysql"  "%{_sysconfdir}/%{name}/management/db.properties"
 grep -s -q "db.simulator.driver=jdbc:mysql" "%{_sysconfdir}/%{name}/management/db.properties"
|| sed -i -e "\$adb.simulator.driver=jdbc:mysql" "%{_sysconfdir}/%{name}/management/db.properties"
 
 if [ ! -f %{_datadir}/cloudstack-common/scripts/vm/hypervisor/xenserver/vhd-util ] ; then


Mime
View raw message