- revert loader change; it doesn't need to go on the RHEL5 branch

2 files changed, 0 insertions, 13 deletions

diff --git a/ChangeLog b/ChangeLog
index b8b2b0f99..77c07cc8a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,3 @@
-2007-01-15  Peter Jones  <pjones@redhat.com>
-
-	* loader/loader.c (main): add RHupdates and friends to PATH
-
 2007-01-15  Dave Lehman  <dlehman@redhat.com>
 
 	* installclasses/rhel.py: don't use lists for repopath values
diff --git a/loader2/loader.c b/loader2/loader.c
index dbdc1f2d3..488743664 100644
--- a/loader2/loader.c
+++ b/loader2/loader.c
@@ -1338,7 +1338,6 @@ int main(int argc, char ** argv) {
 
     struct loaderData_s loaderData;
 
-    char *path = NULL;
     char * cmdLine = NULL;
     char * ksFile = NULL;
     int testing = 0;
@@ -1622,16 +1621,11 @@ 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);
@@ -1641,9 +1635,6 @@ 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);