+++ /dev/null
---- 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
-@@ -29,11 +29,11 @@
- else:
- path = None
-
--productStamp = ""
--productName = "anaconda"
--productVersion = "bluesky"
--productPath = "Packages"
-+productStamp = "pld"
-+productName = "PLD Linux Distribution"
-+productVersion = "3.0 (Th)"
-+productPath = "PLD"
- productArch = None
--bugUrl = "your distribution provided bug reporting tool."
-+bugUrl = "http://bugs.pld-linux.org/"
-
- if path is not None:
- f = open(path, "r")
+++ /dev/null
---- anaconda-11.0.5/scripts/splittree.py 2005-05-16 19:11:52.000000000 +0300
-+++ /usr/lib/anaconda-runtime/splittree.py 2006-05-18 00:47:56.275877225 +0300
-@@ -36,7 +36,11 @@
- _ts = rpm.TransactionSet()
- _ts.setVSFlags(-1)
- fd = os.open(pkgfile, os.O_RDONLY)
-- h = _ts.hdrFromFdno(fd)
-+ try:
-+ h = _ts.hdrFromFdno(fd)
-+ except:
-+ raise RuntimeError, 'rpm: %s %s' % (pkgfile, sys.exc_info()[1])
-+
- os.close(fd)
- return "%s-%s-%s.%s.rpm" %(h['name'], h['version'], h['release'],
- h['arch'])
-@@ -217,7 +221,10 @@
-
- # now create the dirs for disc1
- for j in range(0, len(dirlist)):
-- os.makedirs("%s-disc%d/%s" % (self.dist_dir, i, dirlist[j]))
-+ try:
-+ os.makedirs("%s-disc%d/%s" % (self.dist_dir, i, dirlist[j]))
-+ except:
-+ pass
-
- for j in range(0, len(filelist)):
- filelist[j] = string.replace(filelist[j], self.dist_dir, '')
-@@ -228,7 +235,10 @@
- pass
-
- # now create the product/RPMS dir
-- os.makedirs("%s-disc%d/%s/RPMS" % (self.dist_dir, i, self.product_path))
-+ try:
-+ os.makedirs("%s-disc%d/%s/RPMS" % (self.dist_dir, i, self.product_path))
-+ except:
-+ pass
-
- else:
- os.makedirs("%s-disc%d/%s/RPMS" % (self.dist_dir, i, self.product_path))
---- anaconda-11.0.5/fsset.py~ 2006-05-24 22:08:46.490080945 +0300
-+++ anaconda-11.0.5/fsset.py 2006-05-24 22:17:32.421824167 +0300
-@@ -1284,6 +1284,8 @@
- isys.makeDevInode(root.device.getDevice(), dev)
- rdev = os.stat(dev).st_rdev
-
-+ if os.path.exists(instPath + "/dev/root"):
-+ os.unlink(instPath + "/dev/root")
- os.mknod("%s/dev/root" % (instPath,), stat.S_IFBLK | 0600, rdev)
-
- # return the "boot" device
---- anaconda-11.0.5/anaconda 2006-06-05 23:04:26.382957338 +0300
-+++ anaconda-11.0.5/anaconda 2006-06-05 23:04:04.572468297 +0300
-@@ -952,7 +952,8 @@
- logfile = xlogfile,
- xStartedCB = doStartupX11Actions,
- xQuitCB = doShutdownX11Actions, useFB = useFBX)
-- except RuntimeError:
-+ except RuntimeError, msg:
-+ log.warning("xserver.startX: %s", msg)
- xsetup_failed = True
-
- if xsetup_failed:
---- anaconda-11.0.5/iutil.py~ 2006-09-28 14:47:23.119103876 +0300
-+++ anaconda-11.0.5/iutil.py 2006-09-28 18:12:24.254179111 +0300
-@@ -405,6 +405,10 @@
-
- # make the device-mapper control node
- def makeDMNode(root="/"):
-+ # skip the mknod if path already exists -- created by udev
-+ if os.path.exists(root + "/dev/mapper/control"):
-+ return
-+
- major = minor = None
-
- for (fn, devname, val) in ( ("/proc/devices", "misc", "major"),
+++ /dev/null
---- anaconda-11.0.5/anaconda 2006-06-06 20:38:29.731167253 +0300
-+++ anaconda-11.0.5-antihackery/anaconda 2006-06-06 20:26:53.335544911 +0300
-@@ -1029,28 +1029,11 @@
- addpid(child)
- os.kill(child, signal.SIGCONT)
-
--
--# setup links required for all install types
--for i in ( "services", "protocol", "nsswitch.conf", "joe", "selinux"):
-- try:
-- os.symlink ("../mnt/runtime/etc/" + i, "/etc/" + i)
-- except:
-- pass
--
- #
- # setup links required by graphical mode if installing and verify display mode
- #
- if (display_mode == 'g'):
- stdoutLog.info (_("Starting graphical installation..."))
-- if not flags.test and flags.setupFilesystems:
-- for i in ( "imrc", "im_palette.pal", "gtk-2.0", "pango", "fonts",
-- "fb.modes"):
-- try:
-- if os.path.exists("/mnt/runtime/etc/%s" %(i,)):
-- os.symlink ("../mnt/runtime/etc/" + i, "/etc/" + i)
-- except:
-- pass
--
- try:
- from gui import InstallInterface
- except Exception, e:
---- anaconda-11.0.5/yuminstall.py 2006-06-06 20:38:29.721167028 +0300
-+++ anaconda-11.0.5-antihackery/yuminstall.py 2006-06-06 20:37:06.879307087 +0300
-@@ -879,25 +879,6 @@
- self.initLog(id, instPath)
-
- if flags.setupFilesystems:
-- # setup /etc/rpm/platform for the post-install environment
-- iutil.writeRpmPlatform(instPath)
--
-- try:
-- # FIXME: making the /var/lib/rpm symlink here is a hack to
-- # workaround db->close() errors from rpm
-- iutil.mkdirChain("/var/lib")
-- for path in ("/var/tmp", "/var/lib/rpm"):
-- if os.path.exists(path) and not os.path.islink(path):
-- iutil.rmrf(path)
-- if not os.path.islink(path):
-- os.symlink("/mnt/sysimage/%s" %(path,), "%s" %(path,))
-- else:
-- log.warning("%s already exists as a symlink to %s" %(path, os.readlink(path),))
-- except Exception, e:
-- # how this could happen isn't entirely clear; log it in case
-- # it does and causes problems later
-- log.error("error creating symlink, continuing anyway: %s" %(e,))
--
- # SELinux hackery (#121369)
- if flags.selinux:
- try:
+++ /dev/null
---- anaconda-11.0.5/installclasses/custom.py~ 2005-09-17 00:29:58.000000000 +0300
-+++ anaconda-11.0.5/installclasses/custom.py 2006-06-04 04:20:48.641449016 +0300
-@@ -18,7 +18,7 @@
- showMinimal = 1
- hidden = 1
-
-- def setInstallData(self, id):
-+ def setInstallData(self, id, intf = None):
- BaseInstallClass.setInstallData(self, id)
- BaseInstallClass.setDefaultPartitioning(self, id.partitions,
- CLEARPART_TYPE_LINUX)
+++ /dev/null
---- 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,6 +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", "kernel-xen",
-+ "kernel-grsecurity", "kernel-grsecurity-smp",
- "kernel-PAE"):
- if len(self.ayum.tsInfo.matchNaevr(name=k)) > 0:
- self.selectModulePackages(anaconda, k)
+++ /dev/null
---- 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/lib/anaconda
--RUNTIMEDIR = /usr/lib/anaconda-runtime
-+PYTHONLIBDIR = /usr/$(LIBDIR)/anaconda
-+RUNTIMEDIR = /usr/$(LIBDIR)/anaconda-runtime
- ANACONDADATADIR = /usr/share/anaconda
- 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
-@@ -358,19 +358,19 @@
- break
-
- if haveUpdates:
-- sys.path.insert(ndx+1, '/usr/lib/anaconda')
-- sys.path.insert(ndx+2, '/usr/lib/anaconda/textw')
-- sys.path.insert(ndx+3, '/usr/lib/anaconda/iw')
-+ sys.path.insert(ndx+1, '/usr/%s/anaconda' % sys.lib)
-+ sys.path.insert(ndx+2, '/usr/%s/anaconda/textw' % sys.lib)
-+ sys.path.insert(ndx+3, '/usr/%s/anaconda/iw' % sys.lib)
- else:
-- sys.path.insert(0, '/usr/lib/anaconda')
-- sys.path.insert(1, '/usr/lib/anaconda/textw')
-- sys.path.insert(2, '/usr/lib/anaconda/iw')
-+ sys.path.insert(0, '/usr/%s/anaconda' % sys.lib)
-+ sys.path.insert(1, '/usr/%s/anaconda/textw' % sys.lib)
-+ sys.path.insert(2, '/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')
-
-@@ -446,7 +446,7 @@
- child = os.fork()
- if child == 0:
- for p in ('/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)
-
- 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')
-
--sys.path.append('/usr/lib/anaconda')
-+sys.path.append('/usr/%s/anaconda' % sys.lib)
-
- import isys
-
-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')
-
--sys.path.append('/usr/lib/anaconda')
-+sys.path.append('/usr/%s/anaconda' % sys.lib)
-
- import isys
- from sys import argv
-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/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
-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 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)
-
- 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
-
- # 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', '/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);
-
+++ /dev/null
---- anaconda-11.0.5/network.py~ 2006-05-24 22:05:53.856227238 +0300
-+++ anaconda-11.0.5/network.py 2006-05-24 22:05:55.836271436 +0300
-@@ -275,6 +275,9 @@
- lines = lines[2:]
- for line in lines:
- dev = string.strip(line[0:6])
-+ # skip sit* devices, they aren't real
-+ if dev.startswith("sit"):
-+ break
- if dev != "lo" and not self.netdevices.has_key(dev):
- if self.firstnetdevice is None:
- self.firstnetdevice = dev
+++ /dev/null
---- anaconda-11.0.5/Makefile 2006-05-24 18:14:57.185905429 +0300
-+++ anaconda-11.0.5/Makefile 2006-05-24 18:46:24.328179443 +0300
-@@ -14,6 +14,8 @@
- endif
- endif
-
-+OPTFLAGS = -ggdb
-+CFLAGS = $(OPTFLAGS)
- CATALOGS = po/anaconda.pot
-
- PYFILES = $(wildcard *.py)
-@@ -24,15 +26,15 @@
- PYTHONPATH="." python scripts/getlangnames.py > lang-names
-
- mini-wm: mini-wm.c
-- gcc -o mini-wm mini-wm.c `pkg-config gtk+-x11-2.0 --cflags --libs`$(CFLAGS)
-+ $(CC) -o mini-wm mini-wm.c `pkg-config gtk+-x11-2.0 --cflags --libs`$(CFLAGS)
-
- xmouse.so: xmouse.c
-- gcc -Wall -o xmouse.o -fPIC -I/usr/X11R6/include -I$(PYTHONINCLUDE) -I $(PYTHONINCLUDE) -c xmouse.c $(CFLAGS)
-- gcc -o xmouse.so -shared xmouse.o -L/usr/X11R6/$(LIBDIR) -lXxf86misc -lX11 -lXext
-+ $(CC) -Wall -o xmouse.o -fPIC -I/usr/X11R6/include -I$(PYTHONINCLUDE) -I $(PYTHONINCLUDE) -c xmouse.c $(CFLAGS)
-+ $(CC) -o xmouse.so -shared xmouse.o -L/usr/X11R6/$(LIBDIR) -lXxf86misc -lX11 -lXext
-
- xutils.so: xutils.c
-- gcc -ggdb -Wall -o xutils.o -fPIC -I/usr/X11R6/include -I$(PYTHONINCLUDE) -I $(PYTHONINCLUDE) -c xutils.c $(CFLAGS)
-- gcc -o xutils.so -shared xutils.o -ggdb -L/usr/X11R6/$(LIBDIR) -lX11
-+ $(CC) $(OPTFLAGS) -Wall -o xutils.o -fPIC -I/usr/X11R6/include -I$(PYTHONINCLUDE) -I $(PYTHONINCLUDE) -c xutils.c $(CFLAGS)
-+ $(CC) -o xutils.so -shared xutils.o $(OPTFLAGS) -L/usr/X11R6/$(LIBDIR) -lX11
-
- depend:
- rm -f *.o *.so *.pyc
---- anaconda-11.0.5/isomd5sum/Makefile~ 2005-03-02 04:29:39.000000000 +0200
-+++ anaconda-11.0.5/isomd5sum/Makefile 2006-05-24 18:37:29.636215985 +0300
-@@ -1,6 +1,7 @@
- include ../Makefile.inc
-
--CFLAGS = -g -fPIC -D_FILE_OFFSET_BITS=64 -I$(PYTHONINCLUDE) -O -Wall -Werror \
-+OPTFLAGS = -g -O
-+CFLAGS = $(OPTFLAGS) -fPIC -D_FILE_OFFSET_BITS=64 -I$(PYTHONINCLUDE) -Wall -Werror \
- -D_FORTIFY_SOURCE=2
- OBJECTS = md5.o libimplantisomd5.o checkisomd5.o pyisomd5sum.c \
- implantisomd5 checkisomd5
-@@ -18,14 +19,14 @@
- all: implantisomd5 checkisomd5 pyisomd5sum.so
-
- %.o: %.c
-- gcc -c -O $(CFLAGS) -o $@ $<
-+ $(CC) -c $(OPTFLAGS) $(CFLAGS) -o $@ $<
-
- implantisomd5: implantisomd5.o md5.o libimplantisomd5.o
-
- checkisomd5: checkisomd5.o md5.o libcheckisomd5.o
-
- pyisomd5sum.so: $(PYOBJS)
-- gcc -shared -g -o pyisomd5sum.so -fpic $(PYOBJS)
-+ $(CC) -shared $(OPTFLAGS) -o pyisomd5sum.so -fpic $(PYOBJS)
-
- install:
- install -m 755 implantisomd5 $(DESTDIR)/$(RUNTIMEDIR)
---- anaconda-11.0.5/stubs/Makefile~ 2006-02-22 22:00:32.000000000 +0200
-+++ anaconda-11.0.5/stubs/Makefile 2006-05-24 18:38:42.777854857 +0300
-@@ -9,7 +9,7 @@
- all: $(TARGETS) libunicode-lite.a
-
- $(LIBUTF8): unicode-lite.c
-- gcc -fPIC -shared -o $@ $< -D_FORTIFY_SOURCE=2
-+ $(CC) -fPIC -shared -o $@ $< -D_FORTIFY_SOURCE=2 $(OPTFLAGS)
-
- libunicode-lite.a: libunicode-lite.a($(OBJECTS))
-
---- anaconda-11.0.5/loader2/Makefile~ 2006-02-22 22:00:32.000000000 +0200
-+++ anaconda-11.0.5/loader2/Makefile 2006-05-24 18:41:33.111671407 +0300
-@@ -34,12 +34,13 @@
- HWLIBS += -lpci
- endif
-
--CFLAGS += -DUSE_LOGDEV -DVERSION='"$(VERSION)"'
-+OPTFLAGS = -ggdb
-+CFLAGS += -DUSE_LOGDEV -DVERSION='"$(VERSION)"' $(OPTFLAGS)
- STATIC = -static
- REALCC=gcc
-
- ifeq (1, $(USEDIET))
--CFLAGS += -DGZLIB=1 -DDIET=1
-+CFLAGS += -DGZLIB=1 -DDIET=1 $(OPTFLAGS)
- DIET=diet
- CC=$(DIET) $(REALCC)
- ISYSLIB = ../isys/libisys-diet.a
-@@ -128,7 +129,7 @@
- $(CC) -DTESTING $(CFLAGS) -o mediacheck.o -c mediacheck.c
- $(CC) -DTESTING $(CFLAGS) -o log.o -c log.c
- $(CC) -DTESTING $(CFLAGS) -o md5.o -c md5.c
-- $(CC) -g $(STATIC) -o checkisomd5 mediacheck.o log.o md5.o \
-+ $(CC) $(OPTFLAGS) -g $(STATIC) -o checkisomd5 mediacheck.o log.o md5.o \
- $(NEWTLIB) $(SLANGLIB)
-
- install: all
-@@ -142,7 +143,7 @@
- install -m 644 module-info $(DESTDIR)/$(RUNTIMEDIR)/loader
-
- dirbrowser: dirbrowser.c
-- gcc -DSTANDALONE -D_FORTIFY_SOURCE=2 -Wall -Werror -ggdb -o dirbrowser dirbrowser.c -lnewt -lslang
-+ $(CC) -DSTANDALONE -D_FORTIFY_SOURCE=2 -Wall -Werror $(OPTFLAGS) -o dirbrowser dirbrowser.c -lnewt -lslang
-
- ifeq (.depend,$(wildcard .depend))
- include .depend
---- anaconda-11.0.5/isys/Makefile~ 2006-02-22 22:04:46.000000000 +0200
-+++ anaconda-11.0.5/isys/Makefile 2006-05-24 18:43:02.223663837 +0300
-@@ -1,6 +1,7 @@
- include ../Makefile.inc
-
--CFLAGS += -I$(PYTHONINCLUDE) -I.. -DHAVE_NFS
-+OPTFLAGS = -g
-+CFLAGS += -I$(PYTHONINCLUDE) -I.. -DHAVE_NFS $(OPTFLAGS)
-
- OBJECTS = nfsmount.o nfsmount_clnt.o nfsmount_xdr.o imount.o getmacaddr.o \
- smp.o devnodes.o cpio.o uncpio.o dasd.o \
-@@ -48,10 +49,10 @@
- $(DIET) $(CC) -c $(CFLAGS) -DGZLIB=1 -DDIET=1 "-Du_char=unsigned char" -o $@ $<
-
- _isys.so: isys.lo $(SOBJECTS)
-- gcc -shared -g -fPIC -o $@ isys.lo $(SOBJECTS) $(LOADLIBES)
-+ $(CC) -shared $(OPTFLAGS) -fPIC -o $@ isys.lo $(SOBJECTS) $(LOADLIBES)
-
- _silo.so: silo.c
-- gcc -shared $(CFLAGS) -fpic -o $@ silo.c ../balkan/libbalkan.a
-+ $(CC) -shared $(CFLAGS) -fpic -o $@ silo.c ../balkan/libbalkan.a
-
- libisys.a: libisys.a($(OBJECTS))
-
---- anaconda-11.0.5/isys/gzlib/Makefile~ 2005-06-13 22:09:23.000000000 +0300
-+++ anaconda-11.0.5/isys/gzlib/Makefile 2006-05-24 18:43:33.684366732 +0300
-@@ -1,6 +1,6 @@
- include ../../Makefile.inc
-
--CFLAGS += -I . -fPIC
-+CFLAGS += -I . -fPIC $(OPTFLAGS)
- SOURCES = bits.c gzip.c inflate.c lzw.c trees.c unzip.c util.c zip.c binding.c \
- deflate.c zip.c
- OBJS = $(patsubst %.c,%.o,$(SOURCES))
---- anaconda-11.0.5/utils/Makefile~ 2006-01-30 21:40:06.000000000 +0200
-+++ anaconda-11.0.5/utils/Makefile 2006-05-24 18:44:44.615951525 +0300
-@@ -7,7 +7,8 @@
-
- LOADERDIR = ../loader2
- LOADLIBES = -lpopt
--CFLAGS += -I.. -I$(LOADERDIR) -fno-strict-aliasing
-+OPTFLAGS = -O -g
-+CFLAGS += -I.. -I$(LOADERDIR) -fno-strict-aliasing $(OPTFLAGS)
- RPMCFLAGS = $(CFLAGS) -I/usr/include/rpm
- LDFLAGS = -g
-
-@@ -37,7 +38,7 @@
- $(LOADLIBES) -lresolv -lpopt -lbz2
-
- md5.o: md5.c md5.h
-- gcc -c -O -g md5.c -D_FORTIFY_SOURCE=2
-+ $(CC) -c $(OPTFLAGS) md5.c -D_FORTIFY_SOURCE=2
-
- hash.o : hash.c
- $(CC) $(RPMCFLAGS) -c -o $@ $<
+++ /dev/null
---- ./scripts/pkgorder 2006-05-18 00:09:50.134726080 +0300
-+++ /pkgorder 2006-05-18 00:09:51.774762776 +0300
-@@ -166,30 +166,30 @@
- ds = PackageOrderer(arch=arch)
- ds.setup(fn=config, excludes=options.excludeList, root = testpath)
-
-- 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, ["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, ["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
- for po in ds.pkgSack.returnPackages():
+++ /dev/null
-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
-
- def getReleaseString(mountpoint):
-- if os.access(mountpoint + "/etc/redhat-release", os.R_OK):
-- f = open(mountpoint + "/etc/redhat-release", "r")
-+ if os.access(mountpoint + "/etc/pld-release", os.R_OK):
-+ f = open(mountpoint + "/etc/pld-release", "r")
- try:
- lines = f.readlines()
- except IOError:
-@@ -490,22 +490,12 @@
-
- # get the release name and version
- # assumes that form is something
-- # 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/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
-@@ -1269,7 +1269,7 @@
- # Figure out current version for upgrade nag and for determining weird
- # upgrade cases
- supportedUpgradeVersion = -1
-- for pkgtup in self.ayum.rpmdb.whatProvides('redhat-release', None, None):
-+ for pkgtup in self.ayum.rpmdb.whatProvides('issue', None, None):
- n, a, e, v, r = pkgtup
- if supportedUpgradeVersion <= 0:
- val = rpmUtils.miscutils.compareEVR((None, '3', '1'),
+++ /dev/null
---- anaconda-10.2.0.52-old/scripts/getkeymaps 2004-05-20 03:00:03.000000000 +0200
-+++ anaconda-10.2.0.52/scripts/getkeymaps 2005-04-24 16:34:23.401958968 +0200
-@@ -37,7 +37,7 @@
-
- for map in $MAPS ; do
- eval find /lib/kbd/keymaps/$PATTERN -name "$map.map*" | while read n; do
-- /bin/loadkeys `basename $n .gz` >/dev/null
-+ /usr/bin/loadkeys `basename $n .gz` >/dev/null
- $READMAP $TMPDIR/`basename $n .map.gz`.map
- done
- done
---- anaconda-11.0.5/fsset.py~ 2006-05-24 20:01:14.938740884 +0300
-+++ anaconda-11.0.5/fsset.py 2006-05-24 20:01:18.218814554 +0300
-@@ -203,7 +203,7 @@
- w = None
-
- devicePath = entry.device.setupDevice(chroot)
-- args = [ "/usr/sbin/badblocks", "-vv", devicePath ]
-+ args = [ "/sbin/badblocks", "-vv", devicePath ]
-
- # entirely too much cutting and pasting from ext2FormatFileSystem
- fd = os.open("/dev/tty5", os.O_RDWR | os.O_CREAT | os.O_APPEND)
-@@ -406,7 +406,7 @@
- os.write(p[1], "y\n")
- os.close(p[1])
-
-- rc = iutil.execWithRedirect("/usr/sbin/mkreiserfs",
-+ rc = iutil.execWithRedirect("/sbin/mkreiserfs",
- ["mkreiserfs", devicePath ],
- stdin = p[0],
- stdout = "/dev/tty5",
-@@ -451,7 +451,7 @@
- if entry.bytesPerInode < 2048:
- xfsBytesPerInode = entry.bytesPerInode
-
-- rc = iutil.execWithRedirect("/usr/sbin/mkfs.xfs",
-+ rc = iutil.execWithRedirect("/sbin/mkfs.xfs",
- ["mkfs.xfs", "-f", "-l", "internal",
- "-i", "size=" + str(xfsBytesPerInode),
- devicePath ],
-@@ -500,7 +500,7 @@
- except:
- self.supported = 0
-
-- if not os.access("/usr/sbin/mkfs.jfs", os.X_OK):
-+ if not os.access("/sbin/mkfs.jfs", os.X_OK):
- self.supported = 0
-
- self.name = "jfs"
-@@ -512,7 +512,7 @@
- devicePath = entry.device.setupDevice(chroot)
- label = labelFactory.createLabel(entry.mountpoint, self.maxLabelChars,
- kslabel = entry.label)
-- rc = iutil.execWithRedirect("/usr/sbin/jfs_tune",
-+ rc = iutil.execWithRedirect("/sbin/jfs_tune",
- ["jfs_tune", "-L", label, devicePath],
- stdout = "/dev/tty5",
- stderr = "/dev/tty5")
-@@ -523,7 +523,7 @@
- def formatDevice(self, entry, progress, chroot='/'):
- devicePath = entry.device.setupDevice(chroot)
-
-- rc = iutil.execWithRedirect("/usr/sbin/mkfs.jfs",
-+ rc = iutil.execWithRedirect("/sbin/mkfs.jfs",
- ["mkfs.jfs", "-q",
- devicePath ],
- stdout = "/dev/tty5",
-@@ -549,7 +549,7 @@
- label = labelFactory.createLabel(entry.mountpoint, self.maxLabelChars,
- kslabel = entry.label)
-
-- rc = iutil.execWithRedirect("/usr/sbin/e2label",
-+ rc = iutil.execWithRedirect("/sbin/e2label",
- ["e2label", devicePath, label],
- stdout = "/dev/tty5",
- stderr = "/dev/tty5")
-@@ -560,7 +560,7 @@
- def formatDevice(self, entry, progress, chroot='/'):
- devicePath = entry.device.setupDevice(chroot)
- devArgs = self.getDeviceArgs(entry.device)
-- args = [ "/usr/sbin/mke2fs", devicePath, "-i", str(entry.bytesPerInode) ]
-+ args = [ "/sbin/mke2fs", devicePath, "-i", str(entry.bytesPerInode) ]
-
- args.extend(devArgs)
- args.extend(self.extraFormatArgs)
-@@ -586,7 +586,7 @@
- if not isys.ext2HasJournal(devicePath, makeDevNode = 0):
- return
-
-- rc = iutil.execWithRedirect("/usr/sbin/tune2fs",
-+ rc = iutil.execWithRedirect("/sbin/tune2fs",
- ["tunefs", "-c0", "-i0", "-Odir_index",
- devicePath],
- stdout = "/dev/tty5",
-@@ -614,7 +614,7 @@
- log.info("Skipping migration of %s, has a journal already.\n" % devicePath)
- return
-
-- rc = iutil.execWithRedirect("/usr/sbin/tune2fs",
-+ rc = iutil.execWithRedirect("/sbin/tune2fs",
- ["tune2fs", "-j", devicePath ],
- stdout = "/dev/tty5",
- stderr = "/dev/tty5")
-@@ -766,7 +766,7 @@
-
- def formatDevice(self, entry, progress, chroot='/'):
- file = entry.device.setupDevice(chroot)
-- rc = iutil.execWithRedirect ("/usr/sbin/mkswap",
-+ rc = iutil.execWithRedirect ("/sbin/mkswap",
- [ "mkswap", '-v1', file ],
- stdout = "/dev/tty5",
- stderr = "/dev/tty5",
-@@ -786,7 +786,7 @@
- else:
- swapLabel = "SWAP-%s" % (devName)
- label = labelFactory.createLabel(swapLabel, self.maxLabelChars)
-- rc = iutil.execWithRedirect ("/usr/sbin/mkswap",
-+ rc = iutil.execWithRedirect ("/sbin/mkswap",
- [ "mkswap", '-v1', "-L", label, file ],
- stdout = "/dev/tty5",
- stderr = "/dev/tty5",
-@@ -824,7 +824,7 @@
- args = [ "mkdosfs", devicePath ]
- args.extend(devArgs)
-
-- rc = iutil.execWithRedirect("/usr/sbin/mkdosfs", args,
-+ rc = iutil.execWithRedirect("/sbin/mkdosfs", args,
- stdout = "/dev/tty5",
- stderr = "/dev/tty5")
- if rc:
-@@ -965,7 +965,7 @@
- isys.makeDevInode(disk[5:], disk)
-
- log.info("going to run %s" %(args,))
-- rc = iutil.execWithRedirect("/usr/sbin/sfdisk", args,
-+ rc = iutil.execWithRedirect("/sbin/sfdisk", args,
- stdout = "/dev/tty5", stderr = "/dev/tty5")
- if rc:
- raise SystemError
-@@ -2069,7 +2069,7 @@
- PartitionDevice(device).setupDevice(chroot,
- devPrefix=devPrefix)
-
-- args = ["/usr/sbin/mdadm", "--create", "/dev/%s" %(self.device,),
-+ args = ["/sbin/mdadm", "--create", "/dev/%s" %(self.device,),
- "--run", "--chunk=%s" %(self.chunksize,),
- "--level=%s" %(self.level,),
- "--raid-devices=%s" %(self.numDisks,)]
---- anaconda-11.0.5/syslogd.py~ 2005-08-12 20:02:54.000000000 +0300
-+++ anaconda-11.0.5/syslogd.py 2006-05-24 20:53:09.758604131 +0300
-@@ -77,10 +77,10 @@
- if not path:
- if os.access ("./anaconda", os.X_OK):
- path = "./anaconda"
-- elif os.access ("/usr/bin/anaconda.real", os.X_OK):
-- path = "/usr/bin/anaconda.real"
-+ elif os.access ("/usr/sbin/anaconda.real", os.X_OK):
-+ path = "/usr/sbin/anaconda.real"
- else:
-- path = "/usr/bin/anaconda"
-+ path = "/usr/sbin/anaconda"
-
- os.execv (path, ("syslogd", "--syslogd", root, log))
-
+++ /dev/null
---- anaconda-11.4.0.8/loader2/loader.c~ 2007-12-14 02:04:10.000000000 +0100
-+++ anaconda-11.4.0.8/loader2/loader.c 2007-12-14 02:04:20.783481654 +0100
-@@ -27,6 +27,7 @@
- #include <execinfo.h>
- #include <fcntl.h>
- #include <newt.h>
-+#include "lang.h"
- #include <popt.h>
- #include <signal.h>
- #include <stdio.h>
-@@ -54,7 +55,6 @@
- #include "loader.h"
- #include "loadermisc.h" /* JKFIXME: functions here should be split out */
- #include "log.h"
--#include "lang.h"
- #include "fwloader.h"
- #include "kbd.h"
- #include "kickstart.h"
---- anaconda-11.4.0.8/loader2/modules.c~ 2007-12-11 00:09:05.000000000 +0100
-+++ anaconda-11.4.0.8/loader2/modules.c 2007-12-14 02:14:35.241251371 +0100
-@@ -21,6 +21,7 @@
- #include <fcntl.h>
- #include <kudzu/kudzu.h>
- #include <newt.h>
-+#include "lang.h"
- #include <popt.h>
- #include <stdlib.h>
- #include <stdio.h>
---- anaconda-11.4.0.8/loader2/driverdisk.c~ 2007-12-11 00:09:05.000000000 +0100
-+++ anaconda-11.4.0.8/loader2/driverdisk.c 2007-12-14 02:16:02.235272469 +0100
-@@ -17,6 +17,7 @@
- #include <fcntl.h>
- #include <kudzu/kudzu.h>
- #include <newt.h>
-+#include "lang.h"
- #include <popt.h>
- #include <stdlib.h>
- #include <stdio.h>
-@@ -28,7 +29,6 @@
- #include "loader.h"
- #include "log.h"
- #include "loadermisc.h"
--#include "lang.h"
- #include "fwloader.h"
- #include "method.h"
- #include "modules.h"
---- anaconda-11.4.0.8/loader2/kickstart.c~ 2007-12-11 00:09:05.000000000 +0100
-+++ anaconda-11.4.0.8/loader2/kickstart.c 2007-12-14 02:26:34.191839534 +0100
-@@ -23,6 +23,7 @@
- #include <fcntl.h>
- #include <kudzu/kudzu.h>
- #include <newt.h>
-+#include "lang.h"
- #include <popt.h>
- #include <stdlib.h>
- #include <string.h>
-@@ -31,7 +32,6 @@
-
- #include "loader.h"
- #include "loadermisc.h"
--#include "lang.h"
- #include "log.h"
- #include "kickstart.h"
-
---- anaconda-11.4.0.8/loader2/hdinstall.c~ 2007-12-11 00:09:05.000000000 +0100
-+++ anaconda-11.4.0.8/loader2/hdinstall.c 2007-12-14 02:27:38.187441262 +0100
-@@ -20,6 +20,7 @@
- #include <errno.h>
- #include <fcntl.h>
- #include <newt.h>
-+#include "lang.h"
- #include <popt.h>
- #include <stdlib.h>
- #include <string.h>
-@@ -33,7 +34,6 @@
- #include "loader.h"
- #include "loadermisc.h"
- #include "log.h"
--#include "lang.h"
- #include "modules.h"
- #include "method.h"
- #include "mediacheck.h"
---- anaconda-11.4.0.8/loader2/nfsinstall.c~ 2007-12-11 00:09:05.000000000 +0100
-+++ anaconda-11.4.0.8/loader2/nfsinstall.c 2007-12-14 02:28:21.684451811 +0100
-@@ -18,13 +18,13 @@
-
- #include <fcntl.h>
- #include <newt.h>
-+#include "lang.h"
- #include <popt.h>
- #include <stdlib.h>
- #include <string.h>
- #include <unistd.h>
-
- #include "loader.h"
--#include "lang.h"
- #include "loadermisc.h"
- #include "kickstart.h"
- #include "log.h"
---- anaconda-11.4.0.8/loader2/urlinstall.c~ 2007-12-11 00:09:05.000000000 +0100
-+++ anaconda-11.4.0.8/loader2/urlinstall.c 2007-12-14 02:29:03.181599806 +0100
-@@ -17,14 +17,15 @@
- */
-
- #include <newt.h>
--#include <popt.h>
- #include <stdlib.h>
- #include <string.h>
- #include <sys/mount.h>
- #include <unistd.h>
-
- #include "../isys/nl.h"
-
-+#include "lang.h"
-+#include <popt.h>
- #include "copy.h"
- #include "kickstart.h"
- #include "loader.h"
---- anaconda-11.4.0.8/loader2/net.c~ 2007-12-11 00:09:05.000000000 +0100
-+++ anaconda-11.4.0.8/loader2/net.c 2007-12-14 02:35:20.655656874 +0100
-@@ -27,6 +27,7 @@
- #include <sys/utsname.h>
- #include <arpa/inet.h>
- #include <errno.h>
-+#include "lang.h"
- #include <popt.h>
- #include <resolv.h>
- #include <net/if.h>
-@@ -44,7 +45,6 @@
- #include "../isys/nl.h"
- #include "../isys/str.h"
-
--#include "lang.h"
- #include "loader.h"
- #include "loadermisc.h"
- #include "log.h"
+++ /dev/null
---- anaconda-11.0.5/gui.py~ 2006-06-06 02:24:50.842147638 +0300
-+++ anaconda-11.0.5/gui.py 2006-06-06 02:44:25.328401561 +0300
-@@ -1125,7 +1125,7 @@
- # also HACK to make it work from RHupdates
- for dir in ("iw/", "/mnt/source/RHupdates/",
- ("/usr/%s/anaconda/iw/" % sys.lib)):
-- path = dir + "release_notes_viewer_gui.py"
-+ path = dir + "release_notes_viewer_gui"
- if os.access(path, os.X_OK):
- break
-
+++ /dev/null
-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/Warsaw"
-
- self.zonetab = zonetab.ZoneTab()
-
-@@ -99,7 +99,7 @@
- asUTC = 0
-
- if (string.find(self.default, "UTC") != -1):
-- self.default = "America/New_York"
-+ self.default = "Europe/Warsaw"
-
- self.default = self.default.replace("_", " ")
-
-@@ -151,7 +151,7 @@
- weight=pango.WEIGHT_BOLD)
- self.markers[entry.tz] = marker
-
-- 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
-@@ -19,6 +19,7 @@
-
- import shutil
- import iutil
-+import string
- import os
- from flags import flags
-
-@@ -44,8 +45,29 @@
-
- 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('# true means your machine uses epoch 1980 in its hardware clock\n')
-+ f.write('# true means your machine uses epoch 1900 in its hardware clock\n')
-+ f.write("SRM=false\n")
- 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('ZONE_INFO_DIR="/usr/share/zoneinfo"\n')
-+ f.write("\n");
-+ f.write('# Scheme you would like to use in your system.\n')
-+ f.write('ZONE_INFO_SCHEME="posix"\n')
-+ f.write("\n")
-+ f.write('# Area (sometimes may be empty)\n')
-+ f.write('ZONE_INFO_AREA="%s"\n' % area)
-+ f.write("\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)
-
+++ /dev/null
---- anaconda-11.0.5/constants.py 2006-03-07 18:45:05.000000000 +0200
-+++ /usr/lib/anaconda/constants.py 2006-05-17 23:50:54.459319784 +0300
-@@ -21,9 +21,12 @@
-
- SELINUX_DEFAULT = 1
-
--cmdline = open("/proc/cmdline", "r").read()
--if cmdline.find("debug") != -1:
-- DEBUG = 1
-+try:
-+ cmdline = open("/proc/cmdline", "r").read()
-+ if cmdline.find("debug") != -1:
-+ DEBUG = 1
-+except:
-+ pass
-
- DISPATCH_BACK = -1
- DISPATCH_FORWARD = 1
---- anaconda-11.0.5/flags.py 2006-02-09 20:43:41.000000000 +0200
-+++ /usr/lib/anaconda/flags.py 2006-05-17 23:54:11.513723977 +0300
-@@ -49,22 +49,25 @@
- self.__dict__['flags']['virtpconsole'] = None
-
-
-- # determine if selinux is enabled or not
-- f = open("/proc/cmdline", "r")
-- line = f.readline()
-- f.close()
-+ try:
-+ # determine if selinux is enabled or not
-+ f = open("/proc/cmdline", "r")
-+ line = f.readline()
-+ f.close()
-
-- tokens = line.split()
-- for tok in tokens:
-- if tok == "selinux":
-- self.__dict__['flags']['selinux'] = 1
-- elif tok == "selinux=0":
-- self.__dict__['flags']['selinux'] = 0
-- elif tok == "selinux=1":
-- self.__dict__['flags']['selinux'] = 1
-+ tokens = line.split()
-+ for tok in tokens:
-+ if tok == "selinux":
-+ self.__dict__['flags']['selinux'] = 1
-+ elif tok == "selinux=0":
-+ self.__dict__['flags']['selinux'] = 0
-+ elif tok == "selinux=1":
-+ self.__dict__['flags']['selinux'] = 1
-
-- if not os.path.exists("/selinux/load"):
-- self.__dict__['flags']['selinux'] = 0
-+ if not os.path.exists("/selinux/load"):
-+ self.__dict__['flags']['selinux'] = 0
-+ except:
-+ pass
-
-
- global flags
---- anaconda-11.0.5/iutil.py 2006-02-06 23:06:46.000000000 +0200
-+++ /usr/lib/anaconda/iutil.py 2006-05-17 23:55:32.015524290 +0300
-@@ -641,13 +641,16 @@
- myarch = rhpl.arch.canonArch
-
- # now allow an override with rpmarch=i586 on the command line (#101971)
-- f = open("/proc/cmdline", "r")
-- buf = f.read()
-- f.close()
-- args = buf.split()
-- for arg in args:
-- if arg.startswith("rpmarch="):
-- myarch = arg[8:]
-+ try:
-+ f = open("/proc/cmdline", "r")
-+ buf = f.read()
-+ f.close()
-+ args = buf.split()
-+ for arg in args:
-+ if arg.startswith("rpmarch="):
-+ myarch = arg[8:]
-+ except:
-+ pass
-
- # now make the current install believe it, too
- rhpl.arch.canonArch = myarch
+++ /dev/null
---- anaconda-11.4.1.27/loader2/loader.c~ 2008-08-27 01:39:53.000000000 +0200
-+++ anaconda-11.4.1.27/loader2/loader.c 2008-08-27 01:42:07.063163028 +0200
-@@ -1136,7 +1136,7 @@
-
- char *url = NULL, *ret = NULL, *devName = NULL, *kbdtype = NULL;
- static struct networkDeviceConfig netDev;
-- int i, rc, dir = 1;
-+ int i, rc = LOADER_NOOP, dir = 1;
- int needsNetwork = 0, class = -1;
- int skipMethodDialog = 0, skipLangKbd = 0;
-
---- anaconda-11.4.1.27/loader2/nfsinstall.c~ 2008-08-11 21:02:14.000000000 +0200
-+++ anaconda-11.4.1.27/loader2/nfsinstall.c 2008-08-27 01:48:04.672161030 +0200
-@@ -58,7 +58,7 @@
- int rc;
-
- entries[0].text = _("NFS server name:");
-- entries[0].value = &newServer;
-+ entries[0].value = (const char **)(&newServer);
- entries[0].flags = NEWT_FLAG_SCROLL;
-
- if (asprintf(&entries[1].text, _("%s directory:"),
-@@ -67,7 +67,7 @@
- abort();
- }
-
-- entries[1].value = &newDir;
-+ entries[1].value = (const char **)(&newDir);
- entries[1].flags = NEWT_FLAG_SCROLL;
- entries[2].text = NULL;
- entries[2].value = NULL;
---- anaconda-11.4.1.27/loader2/net.c~ 2008-08-11 21:02:14.000000000 +0200
-+++ anaconda-11.4.1.27/loader2/net.c 2008-08-27 01:50:47.849163064 +0200
-@@ -290,8 +290,8 @@
- }
-
- do {
-- struct newtWinEntry entry[] = { { N_("ESSID"), &essid, 0 },
-- { N_("Encryption Key"), &wepkey, 0 },
-+ struct newtWinEntry entry[] = { { N_("ESSID"), (const char **)(&essid), 0 },
-+ { N_("Encryption Key"), (const char **)(&wepkey), 0 },
- { NULL, NULL, 0 } };
-
- rc = newtWinEntries(_("Wireless Settings"), buf,
-@@ -329,7 +329,7 @@
- struct in_addr addr;
- struct in6_addr addr6;
- char * ns = "";
-- struct newtWinEntry entry[] = { { N_("Nameserver IP"), &ns, 0 },
-+ struct newtWinEntry entry[] = { { N_("Nameserver IP"), (const char **)(&ns), 0 },
- { NULL, NULL, 0 } };
-
- do {
-@@ -1851,7 +1851,7 @@
- char **deviceNames;
- char *ksMacAddr = NULL, *seconds = strdup("10"), *idstr = NULL;
- struct device **devs;
-- struct newtWinEntry entry[] = {{N_("Seconds:"), (char **) &seconds, 0},
-+ struct newtWinEntry entry[] = {{N_("Seconds:"), (const char **) &seconds, 0},
- {NULL, NULL, 0 }};
-
- devs = getDevices(DEVICE_NETWORK);
---- anaconda-11.4.1.27/yuminstall.py~ 2008-08-11 21:02:14.000000000 +0200
-+++ anaconda-11.4.1.27/yuminstall.py 2008-08-27 01:50:47.849163064 +0200
-@@ -1673,8 +1673,6 @@
- anaconda.id.desktop.setDefaultRunLevel(5)
- break
-
-- for repo in self.ayum.repos.listEnabled():
-- repo.dirCleanup()
-
- # expire yum caches on upgrade
- if anaconda.id.getUpgrade() and os.path.exists("%s/var/cache/yum" %(anaconda.rootPath,)):
projects / packages / anaconda.git / commitdiff