[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

[PATCH] Remove support for RHupdates. updates.img is the way to go now.



---
 anaconda                        |   18 ++----------------
 dmraid.py                       |    2 +-
 docs/anaconda-release-notes.txt |    6 ++----
 docs/install-methods.txt        |    2 --
 fsset.py                        |    3 +--
 gui.py                          |    7 ++-----
 installclass.py                 |    2 --
 language.py                     |    3 +--
 loader2/loader.c                |   20 +-------------------
 scripts/pyrc.py                 |   10 ----------
 yuminstall.py                   |    8 ++++----
 11 files changed, 14 insertions(+), 67 deletions(-)

diff --git a/anaconda b/anaconda
index 6873f4c..06921e2 100755
--- a/anaconda
+++ b/anaconda
@@ -169,17 +169,6 @@ def setupPythonUpdates():
 
     for pypkg in ("rhpl", "yum", "rpmUtils", "urlgrabber", "rhpxl", "pirut",
                   "pykickstart"):
-	if os.access("/mnt/source/RHupdates/%s" %(pypkg,), os.X_OK):
-	    try:
-		os.mkdir("/tmp/updates/%s" %(pypkg,))
-	    except:
-		pass
-
-	    # symlink the existing ones
-	    for f in os.listdir("/mnt/source/RHupdates/%s" %(pypkg,)):
-		os.symlink("/mnt/source/RHupdates/%s/%s" %(pypkg, f),
-			   "/tmp/updates/%s/%s" %(pypkg, f))
-
 	# get the libdir.  *sigh*
 	if os.access("/usr/lib64/python%s/site-packages/%s" %(pyver, pypkg),
 		     os.X_OK):
@@ -375,8 +364,6 @@ def addPoPath(dir):
             gettext.bindtextdomain(basename[:-3], dir)
 
 def setupTranslations():
-    if os.path.isdir("/mnt/source/RHupdates/po"):
-        addPoPath("/mnt/source/RHupdates/po")
     if os.path.isdir("/tmp/updates/po"):
         addPoPath("/tmp/updates/po")
     gettext.textdomain("anaconda")
@@ -433,8 +420,7 @@ def runVNC():
 
     child = os.fork()
     if child == 0:
-        for p in ('/mnt/source/RHupdates/pyrc.py', \
-                '/tmp/updates/pyrc.py', \
+        for p in ('/tmp/updates/pyrc.py', \
                 '/usr/lib/anaconda-runtime/pyrc.py'):
             if os.access(p, os.R_OK|os.X_OK):
                 os.environ['PYTHONSTARTUP'] = p
@@ -604,7 +590,7 @@ if __name__ == "__main__":
     # pull this in to get product name and versioning
     import product
 
-    # this handles setting up RHupdates for pypackages to minimize the set needed
+    # this handles setting up updates for pypackages to minimize the set needed
     setupPythonUpdates()
 
     import signal, traceback, string, isys, iutil, time
diff --git a/dmraid.py b/dmraid.py
index 8a90c03..90b5ad7 100644
--- a/dmraid.py
+++ b/dmraid.py
@@ -27,7 +27,7 @@
 import sys
 import string
 
-_bdModulePath = "/tmp/updates/bdevid/:/mnt/source/RHupdates/bdevid/:"
+_bdModulePath = "/tmp/updates/bdevid/:"
 import block
 oldPath = block.getBdevidPath()
 if not _bdModulePath in oldPath:
diff --git a/docs/anaconda-release-notes.txt b/docs/anaconda-release-notes.txt
index 5ace02b..167411c 100644
--- a/docs/anaconda-release-notes.txt
+++ b/docs/anaconda-release-notes.txt
@@ -121,10 +121,8 @@ the main directory of the floppy.  The installer is invoked with an
 'updates' option from the boot command line, and the user is prompted
 to insert the update disk. The files are copied off into a ramdisk
 location which Python has been instructed to look at first of modules.
-For NFS installes, any files in the directory 'RHupdates' under the
-directory mounted in the loader will also be used before the source
-files shipped in the release.  If one is customizing the distribution
-and the installer then installing over NFS is the fastest way to work.
+If one is customizing the distribution and the installer then installing
+over NFS is the fastest way to work.
 
     The installer will also use an 'updates.img' file to get patched
 source files. This is particularly useful for FTP and HTTP based installs.
diff --git a/docs/install-methods.txt b/docs/install-methods.txt
index 07abd25..b630946 100644
--- a/docs/install-methods.txt
+++ b/docs/install-methods.txt
@@ -57,8 +57,6 @@ Current Installation Methods:
   Update Options:
       - floppy or USB key drive.
       - 'updates.img' file in 'images/' directory.
-      - updated python sources or modules in 'RHupdates/' directory are 
-        used in preference to those in original.
       - remote updates.img downloaded via FTP or HTTP.
 
 - NFS (from a directory of ISOs)
diff --git a/fsset.py b/fsset.py
index 1788361..2e75f7f 100644
--- a/fsset.py
+++ b/fsset.py
@@ -2919,8 +2919,7 @@ def ext2FormatFilesystem(argList, messageFile, windowCreator, mntpoint):
         os.close(fd)
 
         env = os.environ
-        configs = [ "/mnt/source/RHupdates/mke2fs.conf",
-                    "/tmp/updates/mke2fs.conf",
+        configs = [ "/tmp/updates/mke2fs.conf",
                     "/etc/mke2fs.conf",
                   ]
         for config in configs:
diff --git a/gui.py b/gui.py
index 6f95ba2..4657e05 100755
--- a/gui.py
+++ b/gui.py
@@ -403,8 +403,7 @@ def addFrame(dialog, title=None, showtitle = 1):
     dialog.connect ("key-release-event", handleShiftPrintScrnRelease)
 
 def findGladeFile(file):
-    for dir in ("/mnt/source/RHupdates/", "/tmp/updates/",
-                "ui/", "/usr/share/anaconda/ui/",
+    for dir in ("/tmp/updates/", "ui/", "/usr/share/anaconda/ui/",
                 "/usr/share/pirut/ui/"):
         fn = dir + file
         if os.access(fn, os.R_OK):
@@ -421,9 +420,7 @@ def getGladeWidget(file, rootwidget, i18ndomain="anaconda"):
     return (xml, w)
 
 def findPixmap(file):
-    for dir in ("/mnt/source/RHupdates/pixmaps/",
-                 "/mnt/source/RHupdates/",
-                 "/tmp/updates/pixmaps/", "/tmp/updates/",
+    for dir in ( "/tmp/updates/pixmaps/", "/tmp/updates/",
                  "/tmp/product/pixmaps/", "/tmp/product/", "pixmaps/",
                  "/usr/share/anaconda/pixmaps/",
                  "/usr/share/pixmaps/",
diff --git a/installclass.py b/installclass.py
index 8fda4b9..414b5cf 100644
--- a/installclass.py
+++ b/installclass.py
@@ -245,8 +245,6 @@ def availableClasses(showHidden=0):
 
     if os.access("installclasses", os.R_OK):
 	path = "installclasses"
-    elif os.access("/mnt/source/RHupdates/installclasses", os.R_OK):
-        path = "/mnt/source/RHupdates/installclasses"
     elif os.access("/tmp/updates/installclasses", os.R_OK):
         path = "/tmp/updates/installclasses"
     elif os.access("/tmp/product/installclasses", os.R_OK):
diff --git a/language.py b/language.py
index 64ecca2..a853da2 100644
--- a/language.py
+++ b/language.py
@@ -77,8 +77,7 @@ class Language:
                 break
         
         # nick -> (name, short name, font, keyboard, timezone) mapping
-        search = ('lang-table', '/tmp/updates/lang-table',
-                  '/mnt/source/RHupdates/lang-table', '/etc/lang-table',
+        search = ('lang-table', '/tmp/updates/lang-table', '/etc/lang-table',
                   '/usr/lib/anaconda/lang-table')
         for path in search:
             if os.access(path, os.R_OK):
diff --git a/loader2/loader.c b/loader2/loader.c
index baafba8..650f2ae 100644
--- a/loader2/loader.c
+++ b/loader2/loader.c
@@ -358,9 +358,7 @@ static void spawnShell(void) {
         signal(SIGINT, SIG_DFL);
         signal(SIGTSTP, SIG_DFL);
 
-        if (!access("/mnt/source/RHupdates/pyrc.py", R_OK|X_OK))
-            setenv("PYTHONSTARTUP", "/mnt/source/RHupdates/pyrc.py", 1);
-        else if (!access("/tmp/updates/pyrc.py", R_OK|X_OK))
+        if (!access("/tmp/updates/pyrc.py", R_OK|X_OK))
             setenv("PYTHONSTARTUP", "/tmp/updates/pyrc.py", 1);
         else if (!access("/usr/lib/anaconda-runtime/pyrc.py", R_OK|X_OK))
             setenv("PYTHONSTARTUP", "/usr/lib/anaconda-runtime/pyrc.py", 1);
@@ -1609,7 +1607,6 @@ int main(int argc, char ** argv) {
 
     char ** argptr, ** tmparg;
     char * anacondaArgs[50];
-    int useRHupdates = 0;
 
     struct loaderData_s loaderData;
 
@@ -1829,19 +1826,11 @@ int main(int argc, char ** argv) {
         manualDeviceCheck(&loaderData);
     }
 
-    useRHupdates = 0;
     if (loaderData.updatessrc)
         loadUpdatesFromRemote(loaderData.updatessrc, &loaderData);
     else if (FL_UPDATES(flags))
         loadUpdates(&loaderData);
 
-    /* we only want to use RHupdates on nfs installs.  otherwise, we'll 
-     * use files on the first iso image and not be able to umount it */
-    if (!strncmp(url, "nfs:", 4) && !FL_STAGE2(flags)) {
-        logMessage(INFO, "NFS install method detected, will use RHupdates/");
-        useRHupdates = 1;
-    }
-
     /* make sure /tmp/updates exists so that magic in anaconda to */
     /* symlink rhpl/ will work                                    */
     if (access("/tmp/updates", F_OK))
@@ -1857,13 +1846,6 @@ int main(int argc, char ** argv) {
     add_to_path_env("PATH", "/tmp/updates");
     add_to_path_env("PATH", "/tmp/product");
 
-    if (useRHupdates) {
-        add_to_path_env("PYTHONPATH", "/mnt/source/RHupdates");
-        add_to_path_env("LD_LIBRARY_PATH", "/mnt/source/RHupdates");
-        add_to_path_env("PATH", "/mnt/source/RHupdates");
-        add_fw_search_dir(&loaderData, "/mnt/source/RHupdates/firmware");
-    }
-
     stop_fw_loader(&loaderData);
     start_fw_loader(&loaderData);
 
diff --git a/scripts/pyrc.py b/scripts/pyrc.py
index 47b0f02..6acee5b 100755
--- a/scripts/pyrc.py
+++ b/scripts/pyrc.py
@@ -23,15 +23,5 @@ try:
     readline.parse_and_bind("tab: complete")
     del rlcompleter
     del readline
-
-    import os
-    import sys
-    try:
-        os.stat('/mnt/source/RHupdates')
-        sys.path.insert(0, '/mnt/source/RHupdates')
-    except:
-        pass
-    del sys
-    del os
 except:
     pass
diff --git a/yuminstall.py b/yuminstall.py
index 6a2ec7c..3b6525b 100644
--- a/yuminstall.py
+++ b/yuminstall.py
@@ -371,7 +371,7 @@ class AnacondaYum(YumSorter):
         self.macros = {}
 
         if flags.selinux:
-            for directory in ("/tmp/updates", "/mnt/source/RHupdates",
+            for directory in ("/tmp/updates",
                         "/etc/selinux/targeted/contexts/files",
                         "/etc/security/selinux/src/policy/file_contexts",
                         "/etc/security/selinux"):
@@ -977,9 +977,9 @@ keepcache=0
 logfile=/tmp/yum.log
 metadata_expire=0
 obsoletes=True
-pluginpath=/usr/lib/yum-plugins,/tmp/updates/yum-plugins,/mnt/source/RHupdates/yum-plugins
-pluginconfpath=/etc/yum/pluginconf.d,/tmp/updates/pluginconf.d,/mnt/source/RHupdates/pluginconf.d
-reposdir=/etc/yum.repos.d,/tmp/updates/yum.repos.d,/mnt/source/RHupdates/yum.repos.d,/tmp/product/yum.repos.d
+pluginpath=/usr/lib/yum-plugins,/tmp/updates/yum-plugins
+pluginconfpath=/etc/yum/pluginconf.d,/tmp/updates/pluginconf.d
+reposdir=/etc/yum.repos.d,/tmp/updates/yum.repos.d,/tmp/product/yum.repos.d
 """ % (anaconda.rootPath, anaconda.rootPath)
 
         fd = open("/etc/yum.conf", "w")
-- 
1.5.5.1


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]