utils/spacewalk-hostname-rename | 26 +++++++++++++++++++-------
1 file changed, 19 insertions(+), 7 deletions(-)
New commits:
commit af92a3dd2101a0b9759ad63f8abfd138089d5c2f
Author: Milan Zazrivec <mzazrivec(a)redhat.com>
Date: Tue Apr 3 16:23:30 2012 +0200
809444 - support for psql syntax
diff --git a/utils/spacewalk-hostname-rename b/utils/spacewalk-hostname-rename
index 4654bc0..23ff455 100755
--- a/utils/spacewalk-hostname-rename
+++ b/utils/spacewalk-hostname-rename
@@ -29,6 +29,19 @@ BOOTSTRAP_CCO=/var/www/html/pub/bootstrap/client-config-overrides.txt
SAT_LOCAL_RULES_CONF=/var/lib/rhn/rhn-satellite-prep/satellite-local-rules.conf
BACKUP_EXT=.rnmbck
+if [ "$(spacewalk-cfg-get db_backend)" = "oracle" ]; then
+ DBSHELL_QUIT="QUIT"
+ DBSHELL_QUIET="
+set feed off;
+set pages 0;"
+
+elif [ "$(spacewalk-cfg-get db_backend)" = "postgresql" ]; then
+ DBSHELL_QUIT="\q"
+ DBSHELL_QUIET="
+\set QUIET on
+\t"
+fi
+
if [ -x /etc/init.d/oracle ]; then
DB_SERVICE="oracle"
fi
@@ -331,7 +344,7 @@ function update_monitoring_data {
UPDATE rhn_sat_cluster SET vip = '$IP' WHERE public_key LIKE
'${NOCPULSE_OLD_PUBLIC_KEY}%';
UPDATE rhn_sat_node SET ip = '$IP' WHERE EXISTS (SELECT 1 FROM rhn_sat_cluster
RSC WHERE RSC.public_key LIKE '${NOCPULSE_OLD_PUBLIC_KEY}%' AND sat_cluster_id =
RSC.recid);
COMMIT;
-QUIT
+$DBSHELL_QUIT
EOS
}
@@ -410,10 +423,9 @@ then
fi
SQL_RET=$(
-echo "set feed off;
-set pages 0;
+echo "$DBSHELL_QUIET
select 0 from dual;
-exit;
+$DBSHELL_QUIT
" | spacewalk-sql --select-mode -
)
# SQL_RET="${SQL_RET#"${SQL_RET%%[![:space:]]*}"}"
@@ -450,7 +462,7 @@ then
UPDATE rhn_config_macro SET definition='$HOSTNAME' WHERE
name='RHN_SAT_HOSTNAME';
UPDATE rhn_config_macro SET definition='$HOSTNAME' WHERE name='MDOM';
COMMIT;
-QUIT
+$DBSHELL_QUIT
EOS
print_status 0 # just simulate end
fi
@@ -479,7 +491,7 @@ echo -n "Updating other DB entries ... " | tee -a $LOG
spacewalk-sql --select-mode - >>$LOG <<EOS
UPDATE rhntemplatestring SET value='$HOSTNAME' WHERE label='hostname';
COMMIT;
-QUIT
+$DBSHELL_QUIT
EOS
print_status 0 # just simulate end
@@ -493,7 +505,7 @@ echo -n "Changing jabberd settings ... " | tee -a $LOG
spacewalk-sql --select-mode - >>$LOG <<EOS
DELETE FROM rhnPushDispatcher WHERE hostname != '$HOSTNAME';
COMMIT;
-QUIT
+$DBSHELL_QUIT
EOS
for jabber_config_file in c2s.xml s2s.xml sm.xml