summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJeremy Katz <katzj@redhat.com>2003-02-11 05:11:22 +0000
committerJeremy Katz <katzj@redhat.com>2003-02-11 05:11:22 +0000
commit39b46a6cbf9e3f5152e88f22c61e1e38dd2c4016 (patch)
treed55d1f07e85265b22b17b5fde61a49a60f75304d
parent7e43c95e584ba5503d7ba454a721e1b5d860ef26 (diff)
downloadanaconda-39b46a6cbf9e3f5152e88f22c61e1e38dd2c4016.tar.gz
anaconda-39b46a6cbf9e3f5152e88f22c61e1e38dd2c4016.tar.xz
anaconda-39b46a6cbf9e3f5152e88f22c61e1e38dd2c4016.zip
okay, I'm tired of wrapper scripts for LD_LIBRARY_PATH....
-rw-r--r--loader2/loader.c11
1 files changed, 9 insertions, 2 deletions
diff --git a/loader2/loader.c b/loader2/loader.c
index ec7eac3bb..3aee25216 100644
--- a/loader2/loader.c
+++ b/loader2/loader.c
@@ -1091,10 +1091,17 @@ int main(int argc, char ** argv) {
useRHupdates = 0;
}
- if (useRHupdates)
+ if (useRHupdates) {
setenv("PYTHONPATH", "/tmp/updates:/mnt/source/RHupdates", 1);
- else
+ setenv("LD_LIBRARY_PATH",
+ sdupprintf("/tmp/updates:/mnt/source/RHupdates:%s",
+ getenv("LD_LIBRARY_PATH")), 1);
+ } else {
setenv("PYTHONPATH", "/tmp/updates", 1);
+ setenv("LD_LIBRARY_PATH",
+ sdupprintf("/tmp/updates:%s", getenv("LD_LIBRARY_PATH")), 1);
+ }
+
if (!access("/mnt/runtime/usr/lib/libunicode-lite.so.1", R_OK))
setenv("LD_PRELOAD", "/mnt/runtime/usr/lib/libunicode-lite.so.1", 1);