[SM-Commit] GIT changes to master sorcery by Jaka Kranjc (812bca9d870c3b35df5493d8bd999246d2aa9fbd)
Jaka Kranjc
scm at sourcemage.org
Fri Aug 13 11:51:17 EDT 2010
GIT changes to master sorcery by Jaka Kranjc <lynxlynxlynx at sourcemage.org>:
ChangeLog | 1 +
etc/sorcery/config | 1 +
var/lib/sorcery/modules/libtrack | 4 ++--
3 files changed, 4 insertions(+), 2 deletions(-)
New commits:
commit 812bca9d870c3b35df5493d8bd999246d2aa9fbd
Author: Jaka Kranjc <lynxlynxlynx at sourcemage.org>
Commit: Jaka Kranjc <lynxlynxlynx at sourcemage.org>
libtrack: unhardcoded the installwatch location #15594
diff --git a/ChangeLog b/ChangeLog
index d758d79..7e3acdd 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -18,6 +18,7 @@
* libgrimoire: don't hardcode the build dir, patch from Pol Vinogradov,
bug #15501
* cast.8: updated, based on work by Donald Johnson from #15480
+ * libtrack: unhardcoded the installwatch location #15594
2010-07-04 Jaka Kranjc <lynxlynxlynx at sourcemage.org>
* libtrack, libdispel: use the correct whole-line option for grep
diff --git a/etc/sorcery/config b/etc/sorcery/config
index 9b9f0b2..20d92c2 100755
--- a/etc/sorcery/config
+++ b/etc/sorcery/config
@@ -95,6 +95,7 @@ FORCE_BASESYSTEM_DEPENDS=${FORCE_BASESYSTEM_DEPENDS:-off}
CONFIG_CACHE=${CONFIG_CACHE:-/etc/sorcery/local}
SORCERY_INSTALL_LOG=${SORCERY_INSTALL_LOG:-/etc/sorcery/install.log}
+ INSTALLWATCH_SO=${INSTALLWATCH_SO:-/usr/lib/installwatch.so}
SM_LICENSE_DIRECTORY=${SM_LICENSE_DIRECTORY:-/etc/sorcery/licenses}
SM_CONFIG_OPTION_CACHE=${SM_CONFIG_OPTION_CACHE:-/etc/sorcery/local/config_option_cache}
diff --git a/var/lib/sorcery/modules/libtrack b/var/lib/sorcery/modules/libtrack
index 49b3921..4c43f51 100755
--- a/var/lib/sorcery/modules/libtrack
+++ b/var/lib/sorcery/modules/libtrack
@@ -155,9 +155,9 @@ function destroy_stage_root()
##
#---------------------------------------------------------------------
function real_invoke_installwatch() {
- if [ -e /usr/lib/installwatch.so ]; then
+ if [[ -e $INSTALLWATCH_SO ]]; then
export INSTALLWATCHFILE=$IW_LOG
- export LD_PRELOAD=/usr/lib/installwatch.so
+ export LD_PRELOAD=$INSTALLWATCH_SO
fi
}
More information about the SM-Commit
mailing list