diff options
| author | Jeremy Katz <katzj@redhat.com> | 2003-10-13 22:50:10 +0000 |
|---|---|---|
| committer | Jeremy Katz <katzj@redhat.com> | 2003-10-13 22:50:10 +0000 |
| commit | 5b53773c12964bdcea08ff99614865cde248ac50 (patch) | |
| tree | 9c8cb07ce6f03bcde34e2be1beaf69b09bf4742f /loader2 | |
| parent | b46e675920d8d724da69ad0355df872ee3c0a3af (diff) | |
| download | anaconda-5b53773c12964bdcea08ff99614865cde248ac50.tar.gz anaconda-5b53773c12964bdcea08ff99614865cde248ac50.tar.xz anaconda-5b53773c12964bdcea08ff99614865cde248ac50.zip | |
merge final batch of taroon changes for taroon GA.
* s390 z/vm format (actually, left the non-useful part of this out and left
the if 0 until we have the right fix)
* fix initlabel for s390
* ld_library_path for tty2 shell on lib64 arches
Diffstat (limited to 'loader2')
| -rw-r--r-- | loader2/loader.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/loader2/loader.c b/loader2/loader.c index 9c4d6662c..b5aafa4e8 100644 --- a/loader2/loader.c +++ b/loader2/loader.c @@ -261,10 +261,16 @@ static void spawnShell(int flags) { signal(SIGINT, SIG_DFL); signal(SIGTSTP, SIG_DFL); - + +#if defined(__x86_64__) || defined(__s390x__) || defined(__ppc64__) + setenv("LD_LIBRARY_PATH", + "/lib64:/usr/lib64:/usr/X11R6/lib64:/usr/kerberos/lib64:/mnt/usr/lib64:" + "/mnt/sysimage/lib64:/mnt/sysimage/usr/lib64", 1); +#else setenv("LD_LIBRARY_PATH", "/lib:/usr/lib:/usr/X11R6/lib:/mnt/usr/lib:" "/mnt/sysimage/lib:/mnt/sysimage/usr/lib", 1); +#endif execl("/bin/sh", "-/bin/sh", NULL); logMessage("exec of /bin/sh failed: %s", strerror(errno)); |