merge from (now defunct) anaconda-dispatch branch

1 files changed, 0 insertions, 381 deletions

diff --git a/lilo.py b/lilo.py
index e56f56242..25197619f 100644
--- a/lilo.py
+++ b/lilo.py
@@ -147,384 +147,3 @@ class LiloConfigFile:
 	self.order = []
 	self.images = []
 	self.items = {}
-
-class LiloConfiguration:
-
-    def allowLiloLocationConfig(self, fstab):
-	bootDevice = fstab.getBootDevice()
-	if bootDevice[0:2] == "md":
-	    self.setDevice(("raid", bootDevice))
-	    return None
-
-	return 1
-
-    def setLiloImages(self, images):
-	self.liloImages = images
-
-    def getLiloImages(self, fstab):
-        (drives, raid) = fstab.raidList()
-
-	# rearrange the fstab so it's indexed by device
-	mountsByDev = {}
-	for (mntpoint, device, fsystem, doFormat, size) in \
-		    fstab.mountList():
-	    mountsByDev[device] = mntpoint
-
-	for (mntpoint, device, fstype, raidType, start, size, makeup) in raid:
-	    mountsByDev[device] = mntpoint
-	    drives.append(device, "", 2, 0, 0, 0, 0)
-
-	for (device, mntpoint, fsystem, makeup) in fstab.existingRaidList():
-	    mountsByDev[device] = mntpoint
-	    drives.append(device, "", 2, 0, 0, 0, 0)
-	    
-	oldImages = {}
-	for dev in self.liloImages.keys():
-	    oldImages[dev] = self.liloImages[dev]
-
-	self.liloImages = {}
-        foundDos = 0
-	for (dev, devName, fsType, start, size, maxcyl, preexist) in drives:
-	    # ext2 and raid partitions get listed if they're / -- we do
-	    # not allow non-mounted partitions to be booted anymore as
-	    # modules are so unlikely to work out as to be not worth
-	    # worrying about
-	    #
-	    # there is a good chance we should configure them as chain
-	    # loadable, but we don't
-
-            # only list dos and ext2 partitions
-            if fsType != 1 and fsType != 2:
-                continue
-
-	    if (mountsByDev.has_key(dev)):
-		if mountsByDev[dev] == '/':
-		    if oldImages.has_key(dev):
-			self.liloImages[dev] = oldImages[dev]
-		    else:
-			self.liloImages[dev] = ("linux", 2)
-
-            if fsType == 1:
-		if foundDos: continue
-
-		foundDos = 1
-                isys.makeDevInode(dev, '/tmp/' + dev)
-                # this can fail for several reasons, main being
-                # they created a DOS partition in disk druid, but
-                # we haven't written new partition table out yet!
-                # this is because we are called from init in todo.py
-                # which is way too early! FIX in future
-                try:
-                    bootable = isys.checkBoot('/tmp/' + dev)
-                except:
-                    bootable = 0
-
-		os.unlink('/tmp/' + dev)
-
-		if bootable:
-		    if oldImages.has_key(dev):
-			self.liloImages[dev] = oldImages[dev]
-		    else:
-			self.liloImages[dev] = ("dos", fsType)
-
-	# if there is no default image (self.default is None, or invalid)
-	# set the default image to the liunx partition
-	if self.default:
-	    for (label, fsType) in self.liloImages.values():
-		if label == self.default: break
-	    if label != self.default:
-		self.default = None
-
-	if not self.default:
-	    for (label, fsType) in self.liloImages.values():
-		if fsType == 2:
-		    self.default = label
-		    break
-
-	return (self.liloImages, self.default)
-
-    def makeInitrd (self, kernelTag, instRoot):
-	initrd = "/boot/initrd%s.img" % (kernelTag, )
-	if not self.initrdsMade.has_key(initrd):
-            iutil.execWithRedirect("/sbin/mkinitrd",
-                                  [ "/sbin/mkinitrd",
-				    "--ifneeded",
-                                    "-f",
-                                    initrd,
-                                    kernelTag[1:] ],
-                                  stdout = None, stderr = None, searchPath = 1,
-                                  root = instRoot)
-	    self.initrdsMade[kernelTag] = 1
-	return initrd
-
-    def install(self, fstab, instRoot, hdList, upgrade, langs):
-	# If self.liloDevice is None, skipping lilo doesn't work
-	if not self.liloDevice: return
-
-	# If the root partition is on a loopback device, lilo won't work!
-	if fstab.rootOnLoop():
-	    return 
-
-	if not self.liloImages:
-	    (images, default) = self.getLiloImages(fstab)
-	    self.setLiloImages(images)
-
-        # on upgrade read in the lilo config file
-	lilo = LiloConfigFile ()
-	perms = 0644
-        if os.access (instRoot + '/etc/lilo.conf', os.R_OK):
-	    perms = os.stat(instRoot + '/etc/lilo.conf')[0] & 0777
-	    lilo.read (instRoot + '/etc/lilo.conf')
-	    os.rename(instRoot + '/etc/lilo.conf',
-		      instRoot + '/etc/lilo.conf.rpmsave')
-
-	# Remove any invalid entries that are in the file; we probably
-	# just removed those kernels. 
-	for label in lilo.listImages():
-	    (fsType, sl) = lilo.getImage(label)
-	    if fsType == "other": continue
-
-	    if not os.access(instRoot + sl.getPath(), os.R_OK):
-		lilo.delImage(label)
-
-	bootpart = fstab.getBootDevice()
-	boothd = fstab.getMbrDevice()
-
-        useLBA32 = 0
-
-        maxcyl = fstab.getBootPartitionMaxCylFromDrive()
-        if maxcyl > 1024:
-            from log import log
-            log("Maximum cylinder is %s, using lba32" % maxcyl)
-            useLBA32 = 1
-
-
-	if (self.liloDevice == "mbr"):
-	    liloTarget = boothd
-	elif (type(self.liloDevice) == type((1,)) and 
-	      self.liloDevice[0] == "raid"):
-	    liloTarget = self.liloDevice[1]
-	else:
-	    liloTarget = bootpart
-
-	lilo.addEntry("boot", '/dev/' + liloTarget, replace = 0)
-	lilo.addEntry("map", "/boot/map", replace = 0)
-	lilo.addEntry("install", "/boot/boot.b", replace = 0)
-	lilo.addEntry("prompt", replace = 0)
-	lilo.addEntry("timeout", "50", replace = 0)
-        message = "/boot/message"
-        for lang in langs:
-            fn = "/boot/message." + lang
-            if os.access(instRoot + fn, os.R_OK):
-                message = fn
-                break
-	lilo.addEntry("message", message, replace = 0)
-        # XXX edd overrides linear, lba32/linear are mutually exclusive
-        #
-        # test to see if one of these already in lilo.conf, use if so
-        if not lilo.testEntry('lba32') and not lilo.testEntry('linear'):
-            if useLBA32:
-                lilo.addEntry("lba32", replace = 0)
-		if lilo.testEntry("linear"):
-		    lilo.delEntry("linear")
-            elif self.liloLinear:
-                lilo.addEntry("linear", replace = 0)
-
-	smpInstalled = (hdList.has_key('kernel-smp') and 
-                        hdList['kernel-smp'].selected)
-
-	kernelInstalled = (hdList.has_key('kernel') and 
-                           hdList['kernel'].selected)
-
-        enterpriseInstalled = (hdList.has_key('kernel-enterprise') and 
-                               hdList['kernel-enterprise'].selected)
-        
-	# This is a bit odd, but old versions of Red Hat could install
-	# SMP kernels on UP systems, but (properly) configure the UP version.
-	# We don't want to undo that, but we do want folks using this install
-	# to be able to override the kernel to use during installs. This rule
-	# seems to nail this.
-	if (upgrade and not isys.smpAvailable()):
-	    smpInstalled = 0
-
-        rootDev = fstab.getRootDevice ()
-        if rootDev:
-	    # strip off the filesystem; we don't need it
-            rootDev = rootDev[0]
-        else:
-            raise RuntimeError, "Installing lilo, but there is no root device"
-
-        kernelList = []
-        otherList = []
-
-        main = self.default
-
-        for (drive, (label, liloType)) in self.liloImages.items ():
-            if (drive == rootDev) and label:
-                main = label
-            elif label:
-                otherList.append (label, "/dev/" + drive)
-
-	lilo.addEntry("default", self.default)
-
-	mainLabelUsed = 0
-
-	if needsEnterpriseKernel() and enterpriseInstalled:
-	    mainLabelUsed = 1
-	    kernelList.append((main,
-			      hdList['kernel-enterprise'], "enterprise"))
-
-	if smpInstalled:
-	    thisLabel = main
-	    if mainLabelUsed:
-		thisLabel = thisLabel + '-smp'
-	    mainLabelUsed = 1
-
-	    kernelList.append((thisLabel, hdList['kernel-smp'], "smp"))
-
-	thisLabel = main
-	if mainLabelUsed:
-	    thisLabel = thisLabel + '-up'
-
-        if kernelInstalled:
-            kernelList.append((thisLabel, hdList['kernel'], ""))
-
-	for (label, kernel, tag) in kernelList:
-	    kernelTag = "-%s-%s%s" % (kernel[rpm.RPMTAG_VERSION],
-                                      kernel[rpm.RPMTAG_RELEASE], tag)
-	    kernelFile = "/boot/vmlinuz" + kernelTag
-
-	    try:
-		lilo.delImage(label)
-	    except IndexError, msg:
-		pass
-
-	    sl = LiloConfigFile(imageType = "image", path = kernelFile)
-
-	    initrd = self.makeInitrd (kernelTag, instRoot)
-
-	    sl.addEntry("label", label)
-	    if os.access (instRoot + initrd, os.R_OK):
-		sl.addEntry("initrd", initrd)
-
-	    sl.addEntry("read-only")
-	    sl.addEntry("root", '/dev/' + rootDev)
-
-	    if self.liloAppend:
-		sl.addEntry('append', '"%s"' % (self.liloAppend,))
-		
-	    lilo.addImage (sl)
-
-	for (label, device) in otherList:
-	    try:
-		(fsType, sl) = lilo.getImage(label)
-		lilo.delImage(label)
-	    except IndexError:
-		sl = LiloConfigFile(imageType = "other", path = device)
-		sl.addEntry("optional")
-
-	    sl.addEntry("label", label)
-	    lilo.addImage (sl)
-
-	# Sanity check #1. There could be aliases in sections which conflict
-	# with the new images we just created. If so, erase those aliases
-	imageNames = {}
-	for label in lilo.listImages():
-	    imageNames[label] = 1
-
-	for label in lilo.listImages():
-	    (fsType, sl) = lilo.getImage(label)
-	    if sl.testEntry('alias'):
-		alias = sl.getEntry('alias')
-		if imageNames.has_key(alias):
-		    sl.delEntry('alias')
-		imageNames[alias] = 1
-
-	# Sanity check #2. If single-key is turned on, go through all of
-	# the image names (including aliases) (we just built the list) and
-	# see if single-key will still work.
-	if lilo.testEntry('single-key'):
-	    singleKeys = {}
-	    turnOff = 0
-	    for label in imageNames.keys():
-		l = label[0]
-		if singleKeys.has_key(l):
-		    turnOff = 1
-		singleKeys[l] = 1
-	    if turnOff:
-		lilo.delEntry('single-key')
-
-	lilo.write(instRoot + "/etc/lilo.conf", perms = perms)
-
-	# throw away stdout, catch stderr
-	str = iutil.execWithCapture(instRoot + '/sbin/lilo' ,
-			            [ "lilo", "-r", instRoot ],
-			            catchfd = 2, closefd = 1)
-	return str
-
-    def setDevice(self, device):
-	if (type(device) == type((1,))):
-	    self.liloDevice = device
-	elif device != "mbr" and device != "partition" and device:
-	    raise ValueError, "device must be raid, mbr, partition, or None"
-	self.liloDevice = device
-
-    def setLinear(self, linear):
-	self.liloLinear = linear
-
-    def setAppend(self, append):
-	self.liloAppend = append
-
-    def setDefault(self, default):
-	for (label, fsType) in self.liloImages.values():
-	    if label == default:
-		self.default = default
-		return
-	raise IndexError, "unknown lilo label %s" % (default,)
-
-    def getLinear(self):
-	return self.liloLinear
-
-    def getDevice(self):
-	return self.liloDevice
-
-    def getAppend(self):
-	return self.liloAppend
-
-    def setDefaultAppend(self):
-	cdrw = isys.ideCdRwList()
-	str = ""
-	for device in cdrw:
-	    if str: str = str + " "
-	    str = str + ("%s=ide-scsi" % device)
-
-	self.liloAppend = str
-
-    def __init__(self):
-	self.liloImages = {}
-	self.liloDevice = 'mbr'
-	self.liloLinear = 1
-	self.default = None
-	self.initrdsMade = {}
-        # XXX only i386 supports edd, nothing else should
-        # instantiate this class
-        if iutil.getArch() == "i386":
-            import edd
-            self.edd = edd.detect()
-        else:
-            self.edd = 0
-
-	self.setDefaultAppend()
-
-if __name__ == "__main__":
-    config = LiloConfigFile ()
-    config.read ('lilo.conf')
-    print config
-    print "image list", config.listImages()
-    config.delImage ('linux')
-    print '----------------------------------'
-    config = LiloConfigFile ()
-    config.read ('lilo.conf')
-    print config
-    print '----------------------------------'    
-    print config.getImage('linux')