---- anaconda-11.0.5/product.py~ 2006-03-13 21:12:36.000000000 +0200
-+++ anaconda-11.0.5/product.py 2006-05-25 00:21:19.708387579 +0300
-@@ -23,10 +23,10 @@
+--- anaconda-11.2.0.24.org/product.py 2006-05-08 22:22:44.000000000 +0200
++++ anaconda-11.2.0.24/product.py 2007-02-20 19:14:33.134623000 +0100
+@@ -23,10 +23,11 @@
path = None
-
+ productStamp = ""
-productName = "anaconda"
-productVersion = "bluesky"
-productPath = "anaconda"
-bugUrl = "your distribution provided bug reporting tool."
+productName = "PLD Linux Distribution"
-+productVersion = "2.0 (Ac)"
++productVersion = "3.0 (Th)"
+productPath = "PLD"
+bugUrl = "http://bugs.pld-linux.org/"
++
if path is not None:
f = open(path, "r")
---- anaconda-11.0.5/iutil.py~ 2006-06-06 20:14:33.538984888 +0300
-+++ anaconda-11.0.5/iutil.py 2006-06-06 20:31:10.801311289 +0300
-@@ -656,7 +656,7 @@
+--- anaconda-11.2.0.24.org/iutil.py 2007-01-15 20:42:54.000000000 +0100
++++ anaconda-11.2.0.24/iutil.py 2007-02-20 19:14:46.322623000 +0100
+@@ -421,7 +421,7 @@
rhpl.arch.canonArch = myarch
f = open("%s/etc/rpm/platform" %(root,), 'w+')
---- anaconda-11.0.5/yuminstall.py 2006-05-24 18:09:49.619010315 +0300
-+++ anaconda-11.0.5/yuminstall.py 2006-05-25 00:11:54.385696897 +0300
-@@ -697,11 +697,11 @@
- return pkgs[0]
-
- foundkernel = False
-- kpkg = getBestKernelByArch("kernel", self.ayum)
-+ kpkg = getBestKernelByArch("kernel-grsecurity", self.ayum)
+--- anaconda-11.2.0.24.org/yuminstall.py 2007-02-13 14:56:08.000000000 +0100
++++ anaconda-11.2.0.24/yuminstall.py 2007-02-20 19:12:05.894623000 +0100
+@@ -1009,7 +1009,7 @@
# FIXME: this is a bit of a hack. we shouldn't hard-code and
# instead check by provides. but alas.
-- for k in ("kernel", "kernel-smp", "kernel-xen0"):
-+ for k in ("kernel-grsecurity", "kernel-grsecurity-smp", "kernel-xen0"):
+- for k in ("kernel", "kernel-smp", "kernel-xen0", "kernel-xen"):
++ for k in ("kernel", "kernel-smp", "kernel-grsecurity", "kernel-grsecurity-smp", "kernel-xen0", "kernel-xen"):
if len(self.ayum.tsInfo.matchNaevr(name=k)) > 0:
foundkernel = True
-@@ -736,8 +736,8 @@
-
- if not foundkernel and (isys.smpAvailable() or isys.htavailable()):
- try:
-- ksmp = getBestKernelByArch("kernel-smp", self.ayum)
-- log.info("selected kernel-smp package for kernel")
-+ ksmp = getBestKernelByArch("kernel-grsecurity-smp", self.ayum)
-+ log.info("selected kernel-grsecurity-smp package for kernel")
- foundkernel = True
- except PackageSackError:
- ksmp = None
-@@ -750,7 +750,7 @@
- self.selectPackage("kernel-smp-devel")
-
- if not foundkernel:
-- log.info("selected kernel package for kernel")
-+ log.info("selected kernel-grsecurity package for kernel")
- self.ayum.install(po=kpkg)
- if len(self.ayum.tsInfo.matchNaevr(name="gcc")) > 0:
- log.debug("selecting kernel-devel")
-@@ -1028,7 +1028,7 @@
- kernelVersions = []
-
- # nick is used to generate the lilo name
-- for (ktag, nick) in [ ('kernel-smp', 'smp'),
-+ for (ktag, nick) in [ ('kernel-grsecurity-smp', 'smp'),
- ('kernel-xen0', 'xen0'),
- ('kernel-xenU', 'xenU') ]:
- tag = ktag.rsplit('-', 1)[1]
-@@ -1036,7 +1036,7 @@
- version = ( tsmbr.version + '-' + tsmbr.release + tag)
- kernelVersions.append((version, nick))
-
-- for tsmbr in self.ayum.tsInfo.matchNaevr(name='kernel'):
-+ for tsmbr in self.ayum.tsInfo.matchNaevr(name='kernel-grsecurity'):
- version = ( tsmbr.version + '-' + tsmbr.release)
- kernelVersions.append((version, 'up'))
-
---- anaconda-11.0.5/bootloader.py~ 2006-01-31 18:34:46.000000000 +0200
-+++ anaconda-11.0.5/bootloader.py 2006-05-25 00:14:22.269017091 +0300
-@@ -145,7 +145,7 @@
- return
-
- plainLabelUsed = 0
-- defkern = "kernel"
-+ defkern = "kernel-grsecurity"
- for (version, nick) in backend.kernelVersionList():
- if plainLabelUsed:
- kernelList.append(("%s-%s" %(kernelLabel, nick),
-@@ -156,7 +156,7 @@
- if nick in ("hypervisor", "guest"): # XXX: *sigh* inconsistent
- defkern = "kernel-xen-%s" %(nick,)
- elif nick != "up":
-- defkern = "kernel-%s" %(nick,)
-+ defkern = "kernel-grsecurity-%s" %(nick,)
- plainLabelUsed = 1
-
- f = open(instRoot + "/etc/sysconfig/kernel", "w+")
---- anaconda-11.0.5/Makefile.inc~ 2005-06-13 22:09:23.000000000 +0300
-+++ anaconda-11.0.5/Makefile.inc 2006-05-18 22:34:08.000000000 +0300
+--- anaconda/Makefile.inc.org 2007-02-20 21:29:51.230623000 +0100
++++ anaconda/Makefile.inc 2007-02-20 21:30:25.302623000 +0100
@@ -1,8 +1,8 @@
#
# define destination locations
+PYTHONLIBDIR = /usr/$(LIBDIR)/anaconda
+RUNTIMEDIR = /usr/$(LIBDIR)/anaconda-runtime
ANACONDADATADIR = /usr/share/anaconda
- PYTHON = python2.4
- PYTHONINCLUDE = /usr/include/$(PYTHON)
---- ./anaconda 2006-05-18 23:48:57.000000000 +0300
-+++ anaconda-11.0.5/anaconda 2006-05-19 00:34:17.000000000 +0300
-@@ -275,12 +275,7 @@
-
- # handle updates of just a single file in a python package
- def setupPythonUpdates():
-- import glob
--
-- # get the python version. first of /usr/lib/python*, strip off the
-- # first 15 chars
-- pyvers = glob.glob("/usr/lib/python*")
-- pyver = pyvers[0][15:]
-+ pyver = sys.version[:3]
-
- try:
- os.mkdir("/tmp/updates")
-@@ -289,12 +284,7 @@
-
- for pypkg in ("rhpl", "yum", "rpmUtils", "urlgrabber", "repomd",
- "pykickstart", "rhpxl"):
-- # get the libdir. *sigh*
+ PYVER := $(shell python -c 'import sys; print sys.version[0:3]')
+ PYTHON = python$(PYVER)
+diff -ur anaconda-11.2.0.24/anaconda anaconda-11.2.0.24/anaconda
+--- anaconda-11.2.0.24/anaconda 2007-02-01 23:55:38.000000000 +0100
++++ anaconda-11.2.0.24/anaconda 2007-02-20 18:15:06.726623000 +0100
+@@ -147,17 +142,7 @@
+ "/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):
- libdir = "lib64"
-- else:
+- elif os.access("/usr/lib/python%s/site-packages/%s" %(pyver, pypkg),
+- os.X_OK):
- libdir = "lib"
+- else:
+- # If the directory doesn't exist, there's nothing to link over.
+- # This happens if we forgot to include one of the above packages
+- # in the image, for instance.
+- continue
+ libdir = sys.lib
-
- if os.access("/mnt/source/RHupdates/%s" %(pypkg,), os.X_OK):
- try:
-@@ -330,15 +320,15 @@
- sys.path.append('textw')
- sys.path.append('iw')
- else:
-- sys.path.append('/usr/lib/anaconda')
-- sys.path.append('/usr/lib/anaconda/textw')
-- sys.path.append('/usr/lib/anaconda/iw')
-+ sys.path.append('/usr/%s/anaconda' % sys.lib)
-+ sys.path.append('/usr/%s/anaconda/textw' % sys.lib)
-+ sys.path.append('/usr/%s/anaconda/iw' % sys.lib)
-
- if (os.path.exists('booty')):
- sys.path.append('booty')
- sys.path.append('booty/edd')
- else:
-- sys.path.append('/usr/lib/booty')
-+ sys.path.append('/usr/%s/booty' % sys.lib)
-
- sys.path.append('/usr/share/system-config-keyboard')
- sys.path.append('/usr/share/system-config-date')
-@@ -1025,7 +1015,7 @@
- if shpid == 0:
- for p in ('/mnt/source/RHupdates/pyrc.py', \
- '/tmp/updates/pyrc.py', \
-- '/usr/lib/anaconda-runtime/pyrc.py'):
-+ ('/usr/%s/anaconda-runtime/pyrc.py' % sys.lib)):
- if os.access(p, os.R_OK|os.X_OK):
- os.environ['PYTHONSTARTUP'] = p
- break
---- anaconda-11.0.5/installclass.py~ 2006-05-19 00:01:55.000000000 +0300
-+++ anaconda-11.0.5/installclass.py 2006-05-19 00:01:56.000000000 +0300
-@@ -492,7 +492,7 @@
- elif os.access("/tmp/product/installclasses", os.R_OK):
- path = "/tmp/product/installclasses"
- else:
-- path = "/usr/lib/anaconda/installclasses"
-+ path = "/usr/%s/anaconda/installclasses" % sys.lib
-
- # append the location of installclasses to the python path so we
- # can import them
---- anaconda-11.0.5/language.py 2006-05-19 00:03:47.000000000 +0300
-+++ anaconda-11.0.5/language.py 2006-05-19 00:10:52.000000000 +0300
-@@ -22,6 +22,7 @@
- from rhpl.simpleconfig import SimpleConfigFile
-
- import logging
-+import sys
- log = logging.getLogger("anaconda")
- # Converts a single language into a "language search path". For example,
-@@ -58,7 +59,7 @@
- self.current = "en_US.UTF-8"
-
- # English name -> native name mapping
-- search = ('lang-names', '/usr/lib/anaconda/lang-names')
-+ search = ('lang-names', ('/usr/%s/anaconda/lang-names' % sys.lib))
- for path in search:
- if os.access(path, os.R_OK):
- f = open(path, 'r')
-@@ -73,7 +74,7 @@
- # nick -> (name, short name, font, keyboard, timezone) mapping
- search = ('lang-table', '/tmp/updates/lang-table',
- '/mnt/source/RHupdates/lang-table', '/etc/lang-table',
-- '/usr/lib/anaconda/lang-table')
-+ '/usr/%s/anaconda/lang-table' % sys.lib)
- for path in search:
- if os.access(path, os.R_OK):
- f = open(path, "r")
---- anaconda-11.0.5/iw/release_notes_viewer_gui.py~ 2006-01-25 21:51:18.000000000 +0200
-+++ anaconda-11.0.5/iw/release_notes_viewer_gui.py 2006-05-19 00:29:16.000000000 +0300
-@@ -20,7 +20,7 @@
-
- from rhpl.translate import _, N_
+ if os.access("/tmp/updates/%s" %(pypkg,), os.X_OK):
+ for f in os.listdir("/usr/%s/python%s/site-packages/%s" %(libdir,
+@@ -303,15 +288,15 @@
+ sys.path.append('textw')
+ sys.path.append('iw')
+ else:
+- sys.path.append('/usr/lib/anaconda')
+- sys.path.append('/usr/lib/anaconda/textw')
+- sys.path.append('/usr/lib/anaconda/iw')
++ sys.path.append('/usr/%s/anaconda' % sys.lib)
++ sys.path.append('/usr/%s/anaconda/textw' % sys.lib)
++ sys.path.append('/usr/%s/anaconda/iw' % sys.lib)
+
+ if (os.path.exists('booty')):
+ sys.path.append('booty')
+ sys.path.append('booty/edd')
+ else:
+- sys.path.append('/usr/lib/booty')
++ sys.path.append('/usr/%s/booty' % sys.lib)
+
+ sys.path.append('/usr/share/system-config-date')
+
+@@ -390,7 +375,7 @@
+ if child == 0:
+ for p in ('/mnt/source/RHupdates/pyrc.py', \
+ '/tmp/updates/pyrc.py', \
+- '/usr/lib/anaconda-runtime/pyrc.py'):
++ '/usr/%s/anaconda-runtime/pyrc.py' % sys.lib):
+ if os.access(p, os.R_OK|os.X_OK):
+ os.environ['PYTHONSTARTUP'] = p
+ break
+diff -ur anaconda-11.2.0.24/command-stubs/list-harddrives-stub anaconda-11.2.0.24/command-stubs/list-harddrives-stub
+--- anaconda-11.2.0.24/command-stubs/list-harddrives-stub 2006-06-22 19:18:11.000000000 +0200
++++ anaconda-11.2.0.24/command-stubs/list-harddrives-stub 2007-02-20 18:19:21.454623000 +0100
+@@ -10,7 +10,7 @@
+ if (os.path.exists('isys')):
+ sys.path.append('isys')
-sys.path.append('/usr/lib/anaconda')
+sys.path.append('/usr/%s/anaconda' % sys.lib)
- from gui import TextViewBrowser, addFrame
-
---- anaconda-11.0.5/scripts/pkgorder~ 2006-05-19 00:12:16.000000000 +0300
-+++ anaconda-11.0.5/scripts/pkgorder 2006-05-19 00:29:50.000000000 +0300
-@@ -23,7 +23,7 @@
- handler.setLevel(logging.ERROR)
- logger.addHandler(handler)
-
--sys.path.append("/usr/lib/anaconda")
-+sys.path.append("/usr/%s/anaconda" % sys.lib)
-
- from optparse import OptionParser
- from repomd.packageSack import PackageSack
---- anaconda-11.0.5/loader2/loader.c~ 2006-03-06 21:45:27.000000000 +0200
-+++ anaconda-11.0.5/loader2/loader.c 2006-05-19 00:31:17.000000000 +0300
-@@ -292,6 +292,8 @@
- 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);
-+ else if (!access("/usr/lib64/anaconda-runtime/pyrc.py", R_OK|X_OK))
-+ setenv("PYTHONSTARTUP", "/usr/lib64/anaconda-runtime/pyrc.py", 1);
- setenv("LD_LIBRARY_PATH", LIBPATH, 1);
- setenv("LANG", "C", 1);
-
---- anaconda-11.0.5/gui.py~ 2006-02-14 21:23:59.000000000 +0200
-+++ anaconda-11.0.5/gui.py 2006-05-19 00:31:53.000000000 +0300
-@@ -1124,7 +1124,7 @@
- # HACK to make release notes to work in test mode
- # also HACK to make it work from RHupdates
- for dir in ("iw/", "/mnt/source/RHupdates/",
-- "/usr/lib/anaconda/iw/"):
-+ ("/usr/%s/anaconda/iw/" % sys.lib)):
- path = dir + "release_notes_viewer_gui.py"
- if os.access(path, os.X_OK):
- break
---- anaconda-11.0.5/command-stubs/loadkeys-stub~ 2004-05-12 00:52:00.000000000 +0300
-+++ anaconda-11.0.5/command-stubs/loadkeys-stub 2006-05-19 00:32:19.000000000 +0300
+ import anaconda_log
+ import parted
+diff -ur anaconda-11.2.0.24/command-stubs/loadkeys-stub anaconda-11.2.0.24/command-stubs/loadkeys-stub
+--- anaconda-11.2.0.24/command-stubs/loadkeys-stub 2004-05-11 23:52:00.000000000 +0200
++++ anaconda-11.2.0.24/command-stubs/loadkeys-stub 2007-02-20 18:18:48.482623000 +0100
@@ -7,7 +7,7 @@
if (os.path.exists('isys')):
sys.path.append('isys')
import isys
---- anaconda-11.0.5/command-stubs/pump-stub~ 2004-01-23 06:01:21.000000000 +0200
-+++ anaconda-11.0.5/command-stubs/pump-stub 2006-05-19 00:32:33.000000000 +0300
+diff -ur anaconda-11.2.0.24/command-stubs/losetup-stub anaconda-11.2.0.24/command-stubs/losetup-stub
+--- anaconda-11.2.0.24/command-stubs/losetup-stub 2001-02-20 20:48:12.000000000 +0100
++++ anaconda-11.2.0.24/command-stubs/losetup-stub 2007-02-20 18:19:53.858623000 +0100
@@ -7,7 +7,7 @@
if (os.path.exists('isys')):
sys.path.append('isys')
import isys
from sys import argv
---- anaconda-11.0.5/command-stubs/list-harddrives-stub~ 2002-08-16 09:07:59.000000000 +0300
-+++ anaconda-11.0.5/command-stubs/list-harddrives-stub 2006-05-19 00:32:59.000000000 +0300
-@@ -10,7 +10,7 @@
+diff -ur anaconda-11.2.0.24/command-stubs/mknod-stub anaconda-11.2.0.24/command-stubs/mknod-stub
+--- anaconda-11.2.0.24/command-stubs/mknod-stub 2006-07-31 22:40:00.000000000 +0200
++++ anaconda-11.2.0.24/command-stubs/mknod-stub 2007-02-20 18:20:05.686623000 +0100
+@@ -1,7 +1,7 @@
+ #!/usr/bin/python
+
+ import sys, os
+-sys.path.append('/usr/lib/anaconda')
++sys.path.append('/usr/%s/anaconda' % sys.lib)
+ import isys
+ import string
+ import stat
+diff -ur anaconda-11.2.0.24/command-stubs/pump-stub anaconda-11.2.0.24/command-stubs/pump-stub
+--- anaconda-11.2.0.24/command-stubs/pump-stub 2004-01-23 05:01:21.000000000 +0100
++++ anaconda-11.2.0.24/command-stubs/pump-stub 2007-02-20 18:19:06.622623000 +0100
+@@ -7,7 +7,7 @@
if (os.path.exists('isys')):
sys.path.append('isys')
-sys.path.append('/usr/lib/anaconda')
+sys.path.append('/usr/%s/anaconda' % sys.lib)
- import parted
- import partedUtils
---- anaconda-11.0.5/command-stubs/raidstart-stub~ 2004-07-12 23:37:25.000000000 +0300
-+++ anaconda-11.0.5/command-stubs/raidstart-stub 2006-05-19 00:33:13.000000000 +0300
+ import isys
+ from sys import argv
+diff -ur anaconda-11.2.0.24/command-stubs/raidstart-stub anaconda-11.2.0.24/command-stubs/raidstart-stub
+--- anaconda-11.2.0.24/command-stubs/raidstart-stub 2006-03-28 18:49:14.000000000 +0200
++++ anaconda-11.2.0.24/command-stubs/raidstart-stub 2007-02-20 18:19:36.002623000 +0100
@@ -12,7 +12,7 @@
sys.path.append('gnome-map')
sys.path.append('isys')
-sys.path.append('/usr/lib/anaconda')
+sys.path.append('/usr/%s/anaconda' % sys.lib)
+ import anaconda_log
import fsset
- import raid
---- anaconda-11.0.5/command-stubs/losetup-stub~ 2001-02-20 21:48:12.000000000 +0200
-+++ anaconda-11.0.5/command-stubs/losetup-stub 2006-05-19 00:33:27.000000000 +0300
-@@ -7,7 +7,7 @@
- if (os.path.exists('isys')):
+diff -ur anaconda-11.2.0.24/command-stubs/raidstop-stub anaconda-11.2.0.24/command-stubs/raidstop-stub
+--- anaconda-11.2.0.24/command-stubs/raidstop-stub 2006-03-28 18:49:14.000000000 +0200
++++ anaconda-11.2.0.24/command-stubs/raidstop-stub 2007-02-20 18:20:21.294623000 +0100
+@@ -12,7 +12,7 @@
+ sys.path.append('gnome-map')
sys.path.append('isys')
-sys.path.append('/usr/lib/anaconda')
+sys.path.append('/usr/%s/anaconda' % sys.lib)
- import isys
- from sys import argv
---- anaconda-11.0.5/command-stubs/mknod-stub~ 2004-12-20 23:20:08.000000000 +0200
-+++ anaconda-11.0.5/command-stubs/mknod-stub 2006-05-19 00:33:39.000000000 +0300
+ import anaconda_log
+ import fsset
+diff -ur anaconda-11.2.0.24/command-stubs/syslogd-stub anaconda-11.2.0.24/command-stubs/syslogd-stub
+--- anaconda-11.2.0.24/command-stubs/syslogd-stub 2006-05-01 18:39:15.000000000 +0200
++++ anaconda-11.2.0.24/command-stubs/syslogd-stub 2007-02-20 18:20:40.322623000 +0100
@@ -1,7 +1,7 @@
#!/usr/bin/python
import sys
-sys.path.append('/usr/lib/anaconda')
+sys.path.append('/usr/%s/anaconda' % sys.lib)
- import isys
- import string
- import stat
---- anaconda-11.0.5/command-stubs/raidstop-stub~ 2004-07-12 23:37:25.000000000 +0300
-+++ anaconda-11.0.5/command-stubs/raidstop-stub 2006-05-19 00:33:50.000000000 +0300
-@@ -12,7 +12,7 @@
- sys.path.append('gnome-map')
- sys.path.append('isys')
--sys.path.append('/usr/lib/anaconda')
-+sys.path.append('/usr/%s/anaconda' % sys.lib)
+ def usage():
+ sys.stderr.write("syslogd [root] [output file]")
+diff -ur anaconda-11.2.0.24/installclass.py anaconda-11.2.0.24/installclass.py
+--- anaconda-11.2.0.24/installclass.py 2007-02-06 17:14:43.000000000 +0100
++++ anaconda-11.2.0.24/installclass.py 2007-02-20 18:09:46.158623000 +0100
+@@ -485,7 +485,7 @@
+ elif os.access("/tmp/product/installclasses", os.R_OK):
+ path = "/tmp/product/installclasses"
+ else:
+- path = "/usr/lib/anaconda/installclasses"
++ path = "/usr/%s/anaconda/installclasses" % sys.lib
- import fsset
- import raid
+ # append the location of installclasses to the python path so we
+ # can import them
+diff -ur anaconda-11.2.0.24/language.py anaconda-11.2.0.24/language.py
+--- anaconda-11.2.0.24/language.py 2006-10-10 19:18:09.000000000 +0200
++++ anaconda-11.2.0.24/language.py 2007-02-20 18:09:46.158623000 +0100
+@@ -21,6 +21,7 @@
+ from rhpl.simpleconfig import SimpleConfigFile
+
+ import logging
++import sys
+ log = logging.getLogger("anaconda")
+
+ # Converts a single language into a "language search path". For example,
+@@ -57,7 +58,7 @@
+ self.current = "en_US.UTF-8"
+
+ # English name -> native name mapping
+- search = ('lang-names', '/usr/lib/anaconda/lang-names')
++ search = ('lang-names', ('/usr/%s/anaconda/lang-names' % sys.lib))
+ for path in search:
+ if os.access(path, os.R_OK):
+ f = open(path, 'r')
+@@ -72,7 +73,7 @@
+ # nick -> (name, short name, font, keyboard, timezone) mapping
+ search = ('lang-table', '/tmp/updates/lang-table',
+ '/mnt/source/RHupdates/lang-table', '/etc/lang-table',
+- '/usr/lib/anaconda/lang-table')
++ '/usr/%s/anaconda/lang-table' % sys.lib)
+ for path in search:
+ if os.access(path, os.R_OK):
+ f = open(path, "r")
+diff -ur anaconda-11.2.0.24/loader2/loader.c anaconda-11.2.0.24/loader2/loader.c
+--- anaconda-11.2.0.24/loader2/loader.c 2007-02-13 17:52:22.000000000 +0100
++++ anaconda-11.2.0.24/loader2/loader.c 2007-02-20 18:17:47.146623000 +0100
+@@ -300,6 +300,8 @@
+ 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);
++ else if (!access("/usr/lib64/anaconda-runtime/pyrc.py", R_OK|X_OK))
++ setenv("PYTHONSTARTUP", "/usr/lib64/anaconda-runtime/pyrc.py", 1);
+ setenv("LD_LIBRARY_PATH", LIBPATH, 1);
+ setenv("LANG", "C", 1);
+
+diff -ur anaconda-11.2.0.24/scripts/pkgorder anaconda-11.2.0.24/scripts/pkgorder
+--- anaconda-11.2.0.24/scripts/pkgorder 2007-01-30 23:26:15.000000000 +0100
++++ anaconda-11.2.0.24/scripts/pkgorder 2007-02-20 18:17:08.462623000 +0100
+@@ -18,8 +18,8 @@
+ import sys
+ import yum
+
+-sys.path.append("/usr/lib/anaconda")
+-sys.path.append("/usr/lib/booty")
++sys.path.append("/usr/%s/anaconda" % sys.lib)
++sys.path.append("/usr/%s/booty" % sys.lib)
+
+ import anaconda_log
+ import logging
+
--- ./scripts/pkgorder 2006-05-18 00:09:50.134726080 +0300
+++ /pkgorder 2006-05-18 00:09:51.774762776 +0300
-@@ -156,27 +156,27 @@
+@@ -166,30 +166,30 @@
ds = PackageOrderer(arch=arch)
ds.setup(fn=config, excludes=options.excludeList, root = testpath)
-- addGroups(ds, ["Core", "Base", "Text-based Internet"])
--
-- addGroups(ds, ["X Window System", "Dialup Networking Support",
-- "Graphical Internet", "Editors",
-- "Graphics", "GNOME Desktop Environment", "Sound and Video",
-- "Printing Support", "Dialup Networking Support"])
--
-- addGroups(ds, ["Office/Productivity", "Engineering and Scientific",
-- "Authoring and Publishing", "Games and Entertainment"])
+- addGroups(ds, ["core", "base", "text-internet"])
++# addGroups(ds, ["core", "base", "text-internet"])
+
+ # hack, hack, hack... make sure iscsi ends up on disc1 (#208832)
+- printMatchingPkgs("iscsi-*")
++# printMatchingPkgs("iscsi-*")
+
+- addGroups(ds, ["base-x", "dial-up",
+- "graphical-internet", "editors",
+- "graphics", "gnome-desktop", "sound-and-video",
+- "printing"])
-
-- addGroups(ds, ["Web Server", "FTP Server", "MySQL Database",
-- "Server Configuration Tools", "DNS Name Server",
-- "Windows File Server", "Administration Tools"])
+- addGroups(ds, ["office", "engineering-and-scientific",
+- "authoring-and-publishing", "games"])
-
-- addGroups(ds, ["KDE (K Desktop Environment)", "Development Tools",
-- "GNOME Software Development", "Eclipse",
-- "Java Development", "KDE Software Development",
-- "PostgreSQL Database", "Mail Server",
-- "Legacy Network Server"])
+- addGroups(ds, ["web-server", "ftp-server", "sql-server",
+- "mysql", "server-cfg", "dns-server",
+- "smb-server", "admin-tools"])
-
-- addGroups(ds, ["News Server", "Legacy Software Development"])
-+# addGroups(ds, ["Base", "Networking"])
-+#
-+# addGroups(ds, ["X Window System", "Dialup Networking Support",
-+# "Graphical Internet", "Editors",
-+# "Graphics", "GNOME Desktop Environment", "Sound and Video",
-+# "Printing Support", "Dialup Networking Support"])
-+#
-+# addGroups(ds, ["Office/Productivity", "Engineering and Scientific",
-+# "Authoring and Publishing", "Games and Entertainment"])
-+#
-+# addGroups(ds, ["Web Server", "FTP Server", "MySQL Database",
-+# "Server Configuration Tools", "DNS Name Server",
-+# "Windows File Server", "Administration Tools"])
-+#
-+# addGroups(ds, ["KDE (K Desktop Environment)", "Development Tools",
-+# "GNOME Software Development", "Eclipse",
-+# "Java Development", "KDE Software Development",
-+# "PostgreSQL Database", "Mail Server",
-+# "Legacy Network Server"])
-+#
-+# addGroups(ds, ["News Server", "Legacy Software Development"])
+- addGroups(ds, ["kde-desktop", "development-tools", "development-libs",
+- "gnome-software-development", "eclipse",
+- "x-software-development",
+- "java-development", "kde-software-development",
+- "mail-server", "network-server", "legacy-network-server"])
++# addGroups(ds, ["base-x", "dial-up",
++# "graphical-internet", "editors",
++# "graphics", "gnome-desktop", "sound-and-video",
++# "printing"])
++
++# addGroups(ds, ["office", "engineering-and-scientific",
++# "authoring-and-publishing", "games"])
++
++# addGroups(ds, ["web-server", "ftp-server", "sql-server",
++# "mysql", "server-cfg", "dns-server",
++# "smb-server", "admin-tools"])
++
++# addGroups(ds, ["kde-desktop", "development-tools", "development-libs",
++# "gnome-software-development", "eclipse",
++# "x-software-development",
++# "java-development", "kde-software-development",
++# "mail-server", "network-server", "legacy-network-server"])
+
+- addGroups(ds, ["news-server", "legacy-software-development"])
++# addGroups(ds, ["news-server", "legacy-software-development"])
- #Everthing else but kernels - don't depsolve
+ #Everthing else but kernels
for po in ds.pkgSack.returnPackages():
---- anaconda-11.0.5/docs/command-line.txt 2005-10-21 20:49:44.000000000 +0300
-+++ anaconda-11.0.5-pldize/docs/command-line.txt 2006-05-24 01:30:47.245988579 +0300
-@@ -124,7 +124,7 @@
- dhcpclass=<class> Sends a custom DHCP vendor class identifier. ISC's dhcpcd can
- inspect this value using "option vendor-class-identifier".
+diff -ur anaconda-11.2.0.24.org/docs/command-line.txt anaconda-11.2.0.24/docs/command-line.txt
+--- anaconda-11.2.0.24.org/docs/command-line.txt 2006-12-04 23:05:25.000000000 +0100
++++ anaconda-11.2.0.24/docs/command-line.txt 2007-02-20 18:24:43.130623000 +0100
+@@ -144,7 +144,7 @@
+
+ updates=http://<path> Image containing updates over HTTP.
-upgradeany Don't require an /etc/redhat-release that matches the
+upgradeany Don't require an /etc/pld-release that matches the
expected syntax to upgrade.
- lang=<lang> Language to use for the installation. This should be a
---- anaconda-11.0.5/partedUtils.py 2006-02-06 23:06:46.000000000 +0200
-+++ anaconda-11.0.5-pldize/partedUtils.py 2006-05-24 01:30:32.535660096 +0300
+ vnc Enable vnc-based installation. You will need to connect
+diff -ur anaconda-11.2.0.24.org/partedUtils.py anaconda-11.2.0.24/partedUtils.py
+--- anaconda-11.2.0.24.org/partedUtils.py 2007-01-16 20:58:13.000000000 +0100
++++ anaconda-11.2.0.24/partedUtils.py 2007-02-20 18:33:58.522623000 +0100
@@ -472,8 +472,8 @@
return None
try:
lines = f.readlines()
except IOError:
-@@ -491,6 +491,7 @@
+@@ -490,22 +490,12 @@
+
# get the release name and version
# assumes that form is something
- # like "Red Hat Linux release 6.2 (Zoot)"
-+ # XXX FIXME parse /etc/pld-release !!!! XXX
- if relstr.find("release") != -1:
- try:
- idx = relstr.find("release")
---- anaconda-11.0.5/scripts/pkgorder 2006-05-24 01:31:27.106878694 +0300
-+++ anaconda-11.0.5-pldize/scripts/pkgorder 2006-05-24 01:27:40.261813387 +0300
-@@ -100,7 +100,7 @@
+- # like "Red Hat Linux release 6.2 (Zoot)"
+- if relstr.find("release") != -1:
+- try:
+- idx = relstr.find("release")
+- prod = relstr[:idx - 1]
+-
+- ver = ""
+- for a in relstr[idx + 8:]:
+- if a in string.digits + ".":
+- ver = ver + a
+- else:
+- break
+-
+- relstr = prod + " " + ver
+- except:
+- pass # don't worry, just use the relstr as we have it
++ # like 2.99 PLD Linux (Th)
++ try:
++ relstr = relstr.split(' ')
++ relstr = relstr[0]
++ except:
++ pass # don't worry, just use the relstr as we have it
+ return relstr
+ return ""
+
+diff -ur anaconda-11.2.0.24.org/scripts/pkgorder anaconda-11.2.0.24/scripts/pkgorder
+--- anaconda-11.2.0.24.org/scripts/pkgorder 2007-02-20 18:23:45.538623000 +0100
++++ anaconda-11.2.0.24/scripts/pkgorder 2007-02-20 18:28:05.766623000 +0100
+@@ -107,10 +107,10 @@
def createConfig(toppath):
yumconfstr = """
[main]
+distroverpkg=issue
gpgcheck=0
reposdir=/dev/null
- exclude=*debuginfo*
---- anaconda-11.0.5/scripts/yumcache 2005-10-18 18:54:00.000000000 +0300
-+++ anaconda-11.0.5-pldize/scripts/yumcache 2006-05-24 01:27:33.711667136 +0300
-@@ -19,7 +19,7 @@
+-exclude=*debuginfo*
++exclude=vserver-packages *debuginfo*
+
+ [anaconda]
+ name=Anaconda
+diff -ur anaconda-11.2.0.24.org/scripts/splittree.py anaconda-11.2.0.24/scripts/splittree.py
+--- anaconda-11.2.0.24.org/scripts/splittree.py 2006-12-13 16:55:23.000000000 +0100
++++ anaconda-11.2.0.24/scripts/splittree.py 2007-02-20 18:27:17.982623000 +0100
+@@ -99,7 +99,7 @@
+ self.src_list = []
+ self.shared_list = []
+ self.reverse_sort_srpms=None
+- self.common_files = ['beta_eula.txt', 'EULA', 'README', 'GPL', 'RPM-GPG-KEY', 'RPM-GPG-KEY-beta', 'RPM-GPG-KEY-fedora']
++ self.common_files = ['beta_eula.txt', 'EULA', 'README', 'GPL', 'RPM-GPG-KEY', 'RPM-GPG-KEY-beta', 'RPM-GPG-KEY-PLD']
+ self.logfile = []
+
+
+diff -ur anaconda-11.2.0.24.org/scripts/yumcache anaconda-11.2.0.24/scripts/yumcache
+--- anaconda-11.2.0.24.org/scripts/yumcache 2007-01-30 22:55:56.000000000 +0100
++++ anaconda-11.2.0.24/scripts/yumcache 2007-02-20 18:24:43.130623000 +0100
+@@ -24,7 +24,7 @@
self.yumconfstr = """
[main]
cachedir=%s
gpgcheck=0
---- anaconda-11.0.5-pldize/yuminstall.py 2006-05-24 01:28:45.453269005 +0300
-+++ anaconda-11.0.5.new/yuminstall.py 2006-08-30 22:56:30.869698805 +0300
-@@ -213,21 +213,21 @@
- debuglevel=2
- logfile=/tmp/yum.log
- pkgpolicy=newest
--distroverpkg=redhat-release
-+distroverpkg=issue
- tolerant=1
- exactarch=1
- retries=5
- obsoletes=1
- gpgcheck=0
- installroot=%s
--exclude=*debuginfo*
-+exclude=vserver-packages *debuginfo*
-
- [anaconda]
- name=Anaconda
- baseurl=%s
- enabled=1
- gpgcheck=0
--gpgkey=%s/RPM-GPG-KEY-fedora
-+gpgkey=%s/RPM-GPG-KEY-PLD
- """ % (self.root, self.methodstr, self.methodstr)
-
- def write(self):
-@@ -938,7 +938,7 @@
+diff -ur anaconda-11.2.0.24.org/yuminstall.py anaconda-11.2.0.24/yuminstall.py
+--- anaconda-11.2.0.24.org/yuminstall.py 2007-02-13 14:56:08.000000000 +0100
++++ anaconda-11.2.0.24/yuminstall.py 2007-02-20 18:26:50.814623000 +0100
+@@ -495,7 +495,7 @@
+ self.conf.reposdir="/tmp/repos.d"
+ self.conf.logfile="/tmp/yum.log"
+ self.conf.obsoletes=True
+- self.conf.exclude=["*debuginfo*"]
++ self.conf.exclude=["*debuginfo*", "vserver-packages"]
+ self.conf.cache=0
+ self.conf.cachedir = '/tmp/cache/'
+ self.conf.metadata_expire = 0
+@@ -1269,7 +1269,7 @@
# Figure out current version for upgrade nag and for determining weird
# upgrade cases
supportedUpgradeVersion = -1
---- anaconda-11.0.5/iw/timezone_gui.py~ 2006-02-16 17:09:07.000000000 +0200
-+++ anaconda-11.0.5/iw/timezone_gui.py 2006-05-24 02:51:14.854100882 +0300
-@@ -41,7 +41,7 @@
+diff -ur anaconda-11.2.0.24.org/iw/timezone_gui.py anaconda-11.2.0.24/iw/timezone_gui.py
+--- anaconda-11.2.0.24.org/iw/timezone_gui.py 2007-01-30 19:54:05.000000000 +0100
++++ anaconda-11.2.0.24/iw/timezone_gui.py 2007-02-20 18:36:25.274623000 +0100
+@@ -43,7 +43,7 @@
gtk.glade.set_custom_handler(self.custom_widget_handler)
# Set the default now. We'll fix it for real in getScreen.
- self.default = "America/New_York"
-+ self.default = "Europe/Tallinn"
++ self.default = "Europe/Warsaw"
self.zonetab = zonetab.ZoneTab()
-@@ -98,7 +98,7 @@
+@@ -99,7 +99,7 @@
asUTC = 0
if (string.find(self.default, "UTC") != -1):
- self.default = "America/New_York"
-+ self.default = "Europe/Tallinn"
++ self.default = "Europe/Warsaw"
# Now fix the default we set when we made the timezone map widget.
self.tz.setCurrent(self.zonetab.findEntryByTZ(self.default))
-@@ -117,7 +117,7 @@
- if curlat >= latmin and curlat <= latmax and curlong >= longmin and curlong <= longmax:
+@@ -126,7 +126,7 @@
+ if tz.lat >= latmin and tz.lat <= latmax and tz.long >= longmin and tz.long <= longmax:
return True
elif user_data.currentEntry == None:
- if model.get_value(iter, 1) == "America/New_York":
-+ if model.get_value(iter, 1) == "Europe/Tallinn":
++ if model.get_value(iter, 1) == "Europe/Warsaw":
return True
else:
return False
-@@ -144,7 +144,7 @@
- weight=pango.WEIGHT_BOLD)
- self.markers[entry.tz] = marker
+@@ -151,7 +151,7 @@
+ weight=pango.WEIGHT_BOLD)
+ self.markers[entry.tz] = marker
-- if entry.tz == "America/New_York":
-+ if entry.tz == "Europe/Tallinn":
- #In case the /etc/sysconfig/clock is messed up, use New York as default
- self.fallbackEntry = entry
-
---- anaconda-11.0.5/timezone.py 2006-09-26 20:37:15.448072953 +0300
-+++ anaconda-11.0.5/timezone.py 2006-09-28 14:46:04.567338250 +0300
-@@ -17,6 +17,8 @@
- import logging
- log = logging.getLogger("anaconda")
+- if entry.tz == "America/New_York":
++ if entry.tz == "Europe/Warsaw":
+ # In case the /etc/sysconfig/clock is messed up, use New
+ # York as the default.
+ self.fallbackEntry = entry
+diff -ur anaconda-11.2.0.24.org/timezone.py anaconda-11.2.0.24/timezone.py
+--- anaconda-11.2.0.24.org/timezone.py 2007-01-17 23:49:50.000000000 +0100
++++ anaconda-11.2.0.24/timezone.py 2007-02-20 19:07:07.498623000 +0100
+@@ -13,6 +13,7 @@
+ import shutil
+ import iutil
+import string
-+
- def bool(val):
- if val: return "true"
- return "false"
-@@ -42,11 +44,31 @@
- log.error("Error copying timezone (from %s): %s" % (fromFile, msg))
+ from flags import flags
+
+ import logging
+@@ -44,12 +45,32 @@
f = open(instPath + "/etc/sysconfig/clock", "w")
--
+
- f.write('ZONE="%s"\n' % self.tz)
+ f.write('# Should the hardware clock be kept in Coordinated Universal Time (instead of local time).\n')
f.write("UTC=%s\n" % bool(self.utc))
+ f.write('# true means your machine uses epoch 1980 in its hardware clock\n')
f.write("ARC=%s\n" % bool(self.arc))
+-
+ f.write('# true means your machine uses epoch 1900 in its hardware clock\n')
+ f.write("SRM=false\n")
-+ f.close()
-+
+ f.close()
+
+ # FIXME: solution for timezones like EET
+ (area, zone) = string.split(self.tz, "/")
-
++
+ f = open(instPath + "/etc/sysconfig/timezone", "w")
+ f.write('# Time zone information.\n')
+ f.write('# Directory containing zone information files.\n')
+ f.write('# Name of the time zone for your system.\n')
+ f.write('TIME_ZONE="%s"\n' % zone)
+ f.write("\n");
- f.close()
-
++
def getTimezoneInfo(self):
+ return (self.tz, self.utc, self.arc)
+
-we should rather use /mnt/runtime path, but maybe later
-
---- anaconda-11.0.5/anaconda~ 2006-05-26 02:12:27.743192704 +0300
-+++ anaconda-11.0.5/anaconda 2006-05-26 02:25:58.301414220 +0300
-@@ -916,7 +916,7 @@
- # now determine if we're going to run in GUI or TUI mode
- #
- # if no X server, we have to use text mode
--if not (flags.test or flags.rootpath) and (iutil.getArch() != "s390" and not os.access("/mnt/runtime/usr/bin/Xorg", os.X_OK)):
-+if not (flags.test or flags.rootpath) and (iutil.getArch() != "s390" and not os.access("/usr/X11R6/bin/X", os.X_OK)):
- stdoutLog.warning(_("Graphical installation not available... "
- "Starting text mode."))
- time.sleep(2)
+; we should rather use /mnt/runtime path, but maybe later
+--- anaconda-11.2.0.24/anaconda~ 2007-02-20 18:23:45.000000000 +0100
++++ anaconda-11.2.0.24/anaconda 2007-02-20 19:16:15.114623000 +0100
+@@ -779,7 +779,7 @@
+ # now determine if we're going to run in GUI or TUI mode
+ #
+ # if no X server, we have to use text mode
+- if not (flags.test or flags.rootpath or x_already_set) and (rhpl.getArch() != "s390" and not os.access("/mnt/runtime/usr/bin/Xorg", os.X_OK)):
++ if not (flags.test or flags.rootpath or x_already_set) and (rhpl.getArch() != "s390" and not os.access("/usr/bin/X", os.X_OK)):
+ stdoutLog.warning(_("Graphical installation not available... "
+ "Starting text mode."))
+ time.sleep(2)
projects / packages / anaconda.git / commitdiff