Juan Hernandez has uploaded a new change for review.
Change subject: core: Use template0 instead of template1
......................................................................
core: Use template0 instead of template1
This change was already initiated in commit
9538658ab884fc1d2e5a78fdd63a3e2c2f3fd51c but some additional files need
to be changed.
Change-Id: If70e4d80f7e83be7f387fc1d3b6a5295c5d235da
Signed-off-by: Juan Hernandez <juan.hernan...@redhat.com>
---
M backend/manager/dbscripts/dbfunctions.sh
M backend/manager/dbscripts/engine-db-install.sh
M backend/manager/dbscripts/restore.sh
M packaging/fedora/setup/basedefs.py
M packaging/fedora/setup/engine-upgrade.py
5 files changed, 5 insertions(+), 4 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/16/8916/1
diff --git a/backend/manager/dbscripts/dbfunctions.sh
b/backend/manager/dbscripts/dbfunctions.sh
index 27390c3..f72ecc7 100755
--- a/backend/manager/dbscripts/dbfunctions.sh
+++ b/backend/manager/dbscripts/dbfunctions.sh
@@ -57,6 +57,7 @@
cmdline="${cmdline} --log-file=${LOGFILE} "
fi
+ echo $cmdline >> /tmp/f.log
eval $cmdline
# save last command return value
retval=$?
diff --git a/backend/manager/dbscripts/engine-db-install.sh
b/backend/manager/dbscripts/engine-db-install.sh
index f242f05..ce8cb2e 100755
--- a/backend/manager/dbscripts/engine-db-install.sh
+++ b/backend/manager/dbscripts/engine-db-install.sh
@@ -36,7 +36,7 @@
DB_PORT="5432"
DB_USER=engine
DB_NAME=engine
-TEMPLATE=template1
+TEMPLATE=template0
LOCAL_DB_SET=1
TABLE_NAME=vdc_options
diff --git a/backend/manager/dbscripts/restore.sh
b/backend/manager/dbscripts/restore.sh
index 07619cb..8a0807b 100755
--- a/backend/manager/dbscripts/restore.sh
+++ b/backend/manager/dbscripts/restore.sh
@@ -51,7 +51,7 @@
fi
cmd="select datname from pg_database where datname ilike '${DATABASE}';"
-res=$(execute_command "${cmd}" template1 ${SERVERNAME} ${PORT})
+res=$(execute_command "${cmd}" template0 ${SERVERNAME} ${PORT})
res=`echo $res | sed "s@^ @@g"`
if [ "${res}" = "${DATABASE}" ]; then
diff --git a/packaging/fedora/setup/basedefs.py
b/packaging/fedora/setup/basedefs.py
index e790f86..8a650ec 100644
--- a/packaging/fedora/setup/basedefs.py
+++ b/packaging/fedora/setup/basedefs.py
@@ -7,7 +7,7 @@
DB_ADMIN="postgres"
DB_NAME="engine"
DB_POSTGRES = "postgres"
-DB_TEMPLATE = "template1"
+DB_TEMPLATE = "template0"
DB_HOST="localhost"
DB_USER="engine"
DB_PORT="5432"
diff --git a/packaging/fedora/setup/engine-upgrade.py
b/packaging/fedora/setup/engine-upgrade.py
index 9fbc03c..d766548 100755
--- a/packaging/fedora/setup/engine-upgrade.py
+++ b/packaging/fedora/setup/engine-upgrade.py
@@ -384,7 +384,7 @@
logging.debug("DB Backup completed successfully")
def restore(self):
- # run psql -U engine -h host -p port -d template1 -f <backup
directory>/<backup_file>
+ # run psql -U engine -h host -p port -d template0 -f <backup
directory>/<backup_file>
# If DB was renamed, restore it
if self.updated or self.dbrenamed:
--
To view, visit http://gerrit.ovirt.org/8916
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: If70e4d80f7e83be7f387fc1d3b6a5295c5d235da
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Juan Hernandez <juan.hernan...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches
