diff options
| author | Peter Jones <pjones@redhat.com> | 2007-01-15 19:10:47 +0000 |
|---|---|---|
| committer | Peter Jones <pjones@redhat.com> | 2007-01-15 19:10:47 +0000 |
| commit | 4ce51633088257d7cc1f4ec0450512aa3c67d474 (patch) | |
| tree | 74db3fa3b98a37f72a79313671c442eace087698 | |
| parent | bccecbfd08910cb6c3c1e5b9df7bdf735b8eb556 (diff) | |
| download | anaconda-4ce51633088257d7cc1f4ec0450512aa3c67d474.tar.gz anaconda-4ce51633088257d7cc1f4ec0450512aa3c67d474.tar.xz anaconda-4ce51633088257d7cc1f4ec0450512aa3c67d474.zip | |
- Add RHupdates and friends to PATH
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | loader2/loader.c | 9 |
2 files changed, 13 insertions, 0 deletions
@@ -1,5 +1,9 @@ 2007-01-15 Peter Jones <pjones@redhat.com> + * loader/loader.c (main): add RHupdates and friends to PATH + +2007-01-15 Peter Jones <pjones@redhat.com> + * lvmErrors.py: (NEW) exception classes for lvm errors * lvm.py: add lvmExec and lvmCapture, which handle e.g. /tmp/lvmout . diff --git a/loader2/loader.c b/loader2/loader.c index 488743664..dbdc1f2d3 100644 --- a/loader2/loader.c +++ b/loader2/loader.c @@ -1338,6 +1338,7 @@ int main(int argc, char ** argv) { struct loaderData_s loaderData; + char *path = NULL; char * cmdLine = NULL; char * ksFile = NULL; int testing = 0; @@ -1621,11 +1622,16 @@ int main(int argc, char ** argv) { useRHupdates = 0; } + path = getenv("PATH"); if (useRHupdates) { setenv("PYTHONPATH", "/tmp/updates:/tmp/product:/mnt/source/RHupdates", 1); setenv("LD_LIBRARY_PATH", sdupprintf("/tmp/updates:/tmp/product:/mnt/source/RHupdates:%s", LIBPATH), 1); + setenv("PATH", + sdupprintf("/tmp/updates:/tmp/product:/mnt/source/RHupdates%s%s", + path ? ":" : "", path ? path : ""), 1); + #ifdef NASH_FIRMWARE_LOADER nashSetFirmwarePath(nc, "/firmware/:/lib/firmware/:/tmp/updates/firmware/:/tmp/product/firmware:/mnt/source/RHupdates/firmware/"); nashHotplugKill(nc); @@ -1635,6 +1641,9 @@ int main(int argc, char ** argv) { setenv("PYTHONPATH", "/tmp/updates:/tmp/product", 1); setenv("LD_LIBRARY_PATH", sdupprintf("/tmp/updates:/tmp/product:%s", LIBPATH), 1); + setenv("PATH", + sdupprintf("/tmp/updates:/tmp/product%s%s", + path ? ":" : "", path ? path : ""), 1); #ifdef NASH_FIRMWARE_LOADER nashSetFirmwarePath(nc, "/firmware/:/lib/firmware/:/tmp/updates/firmware/:/tmp/product/firmware"); nashHotplugKill(nc); |