From 56af8d17f80a0b0430b24eebdf621f5f211bd207 Mon Sep 17 00:00:00 2001 From: fgerlits Date: Wed, 4 Oct 2006 10:45:44 +0000 Subject: [PATCH] some more adjustments needed after [2292] --- livesupport/etc/debian/livesupport-station.postinst | 3 --- livesupport/src/products/scheduler/etc/Makefile.in | 3 ++- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/livesupport/etc/debian/livesupport-station.postinst b/livesupport/etc/debian/livesupport-station.postinst index 5e3186fc4..48f03b9c7 100644 --- a/livesupport/etc/debian/livesupport-station.postinst +++ b/livesupport/etc/debian/livesupport-station.postinst @@ -21,9 +21,6 @@ installdir=/opt/livesupport case "$1" in configure) - # replace the odbcinst.ini template with the debian-specific version - cp -f $installdir/etc/odbcinst_debian_template \ - $installdir/etc/odbcinst_template # do post-installation configuration $installdir/bin/postInstallStation.sh --directory $installdir diff --git a/livesupport/src/products/scheduler/etc/Makefile.in b/livesupport/src/products/scheduler/etc/Makefile.in index bd47d429b..ddcccb510 100644 --- a/livesupport/src/products/scheduler/etc/Makefile.in +++ b/livesupport/src/products/scheduler/etc/Makefile.in @@ -351,7 +351,8 @@ copy_files: ${MKDIR} ${USR_TMP_DIR} ${CP} ${BIN_DIR}/scheduler.sh ${USR_BIN_DIR} ${CP} ${SCHEDULER_EXE} ${USR_BIN_DIR} - ${CP} ${ETC_DIR}/odbcinst_debian_template \ + ${CP} ${ETC_DIR}/odbcinst_old_debian_template \ + ${ETC_DIR}/odbcinst_new_debian_template \ ${ETC_DIR}/odbcinst_template ${USR_ETC_DIR} ${CAT} ${ETC_DIR}/odbc_template | ${SED} -e ${REPLACE_SED_STRING} \ > ${USR_ETC_DIR}/odbc_template