diff options
| -rw-r--r-- | ChangeLog | 15 | ||||
| -rw-r--r-- | bootloader.py | 13 | ||||
| -rw-r--r-- | docs/kickstart-docs.txt | 25 | ||||
| -rw-r--r-- | gui-tags.txt | 3 | ||||
| -rw-r--r-- | installclass.py | 8 | ||||
| -rw-r--r-- | iw/bootloader_main_gui.py | 15 | ||||
| -rw-r--r-- | iw/bootlocwidget.py | 10 | ||||
| -rw-r--r-- | kickstart.py | 35 | ||||
| -rw-r--r-- | packages.py | 6 | ||||
| -rw-r--r-- | textw/bootloader_text.py | 16 | ||||
| -rw-r--r-- | tui-tags.txt | 3 | ||||
| -rw-r--r-- | upgrade.py | 16 |
12 files changed, 26 insertions, 139 deletions
@@ -1,3 +1,18 @@ +2005-02-20 Peter Jones <pjones@redhat.com> + + * bootloader.py: remove code to show lilo as a bootloader choice + * gui-tags.txt: remove reference to lilo_gui.py and LiloWindow + * installclass.py: remove lilo specific code + * kickstart.py: remove lilo specific code + * packages.py: don't choose lilo if "useGrubVal" is 0. + - remove lilo.conf from list of anaconda generated files + * tui-tags.txt: remove references to lilo_text.py and LiloAppendWindow + * upgrade.py: remove code to add lilo package to install set. + * kickstart-docs.txt: remove docs about lilo options + * iw/bootloader_main_gui.py: remove lilo radio button entries + * iw/bootlocwidget.py: remove lilo drive ordering code + * textw/bootloader_text.py: remove lilo bootloader choice + 2005-02-19 Paul Nasrat <pnasrat@redhat.com> * autopart.py, bootdisk/ppc/ofboot.b, fsset.py, installclass.py, diff --git a/bootloader.py b/bootloader.py index 6d0d38981..0f9dba58d 100644 --- a/bootloader.py +++ b/bootloader.py @@ -31,16 +31,6 @@ from rhpl.translate import _ from booty import * from bootloaderInfo import * -showLilo = 0 -try: - f = open("/proc/cmdline", "r") - if f.read().find("lilo") != -1: - showLilo = 1 -except: - pass - - - def bootloaderSetupChoices(dispatch, bl, fsset, diskSet, dir): if dir == DISPATCH_BACK: return @@ -98,9 +88,6 @@ def writeBootloader(intf, instRoot, fsset, bl, langs, comps): if bootType == "GRUB": bl.useGrubVal = 1 bl.setDevice(theDev) - elif bootType == "LILO": - bl.useGrubVal = 0 - bl.setDevice(theDev) else: bl.doUpgradeOnly = 0 diff --git a/docs/kickstart-docs.txt b/docs/kickstart-docs.txt index 53da0f1c2..d99ac23dc 100644 --- a/docs/kickstart-docs.txt +++ b/docs/kickstart-docs.txt @@ -307,12 +307,8 @@ Creating the Kickstart File bootloader (required) - Specifies how the boot loader should be installed and whether the - boot loader should be LILO or GRUB. This option is required for - both installations and upgrades. For upgrades, if --useLilo is not - specified and LILO is the current bootloader, the bootloader will - be changed to GRUB. To preserve LILO on upgrades, use bootloader - --upgrade. + Specifies how the boot loader should be installed. This option is + required for both installations and upgrades. --append= @@ -347,24 +343,9 @@ Creating the Kickstart File If using GRUB, similar to --password= except the password should already be encrypted. - --useLilo - - Use LILO instead of GRUB as the boot loader. - - --linear - - If using LILO, use the linear LILO option; this is only for - backward compatibility (and linear is now used by default). - - --nolinear - - If using LILO, use the nolinear LILO option; linear is the - default. - --lba32 - If using LILO, force use of lba32 mode instead of - auto-detecting. + Force use of lba32 mode instead of auto-detecting. --upgrade diff --git a/gui-tags.txt b/gui-tags.txt index ee5cf4f6f..a8e7f73e2 100644 --- a/gui-tags.txt +++ b/gui-tags.txt @@ -34,9 +34,6 @@ iw/keyboard_gui.py iw/language_gui.py LanguageWindow "lang" -iw/lilo_gui.py - LiloWindow "lilo" - iw/mouse_gui.py MouseWindow "mouse" diff --git a/installclass.py b/installclass.py index 72c14c007..283d9781c 100644 --- a/installclass.py +++ b/installclass.py @@ -66,15 +66,11 @@ class BaseInstallClass: def postAction(self, rootPath, serial, intf = None): pass - def setBootloader(self, id, useLilo=0, location=None, linear=1, - forceLBA=0, password=None, md5pass=None, - appendLine="", driveorder = []): - if useLilo: - id.bootloader.useGrubVal = 0 + def setBootloader(self, id, location=None, forceLBA=0, password=None, + md5pass=None, appendLine="", driveorder = []): if appendLine: id.bootloader.args.set(appendLine) id.bootloader.setForceLBA(forceLBA) - id.bootloader.useLinear = linear if password: id.bootloader.setPassword(password, isCrypted = 0) if md5pass: diff --git a/iw/bootloader_main_gui.py b/iw/bootloader_main_gui.py index 27490fd76..a80e9a62b 100644 --- a/iw/bootloader_main_gui.py +++ b/iw/bootloader_main_gui.py @@ -99,9 +99,6 @@ class MainBootloaderWindow(InstallWindow): if newrc != 1: continue blname = None - elif ((self.lilo_radio is not None) - and (self.lilo_radio.get_active() == gtk.TRUE)): - blname = "LILO" else: blname = "GRUB" break @@ -130,12 +127,6 @@ class MainBootloaderWindow(InstallWindow): self.grub_radio = gtk.RadioButton(None, (_("Use _GRUB as the " "boot loader"))) - if bootloader.showLilo: - self.lilo_radio = gtk.RadioButton(self.grub_radio, - (_("Use _LILO as the boot " - "loader"))) - else: - self.lilo_radio = None self.none_radio = gtk.RadioButton(self.grub_radio, (_("_Do not " "install a " "boot loader"))) @@ -143,14 +134,10 @@ class MainBootloaderWindow(InstallWindow): radio_vbox.pack_start(label, gtk.FALSE) radio_vbox.pack_start(self.grub_radio, gtk.FALSE) - if self.lilo_radio: - radio_vbox.pack_start(self.lilo_radio, gtk.FALSE) radio_vbox.pack_start(self.none_radio, gtk.FALSE) if self.blname is None: self.none_radio.set_active(gtk.TRUE) - elif self.lilo_radio is not None and self.blname == "LILO" and iutil.getArch() == "i386": - self.lilo_radio.set_active(gtk.TRUE) else: self.grub_radio.set_active(gtk.TRUE) @@ -191,8 +178,6 @@ class MainBootloaderWindow(InstallWindow): if self.bl.useGrub(): self.blname = "GRUB" - else: - self.blname = "LILO" # XXX this is kind of ugly if self.dispatch.stepInSkipList("instbootloader"): self.blname = None diff --git a/iw/bootlocwidget.py b/iw/bootlocwidget.py index 30a6a234d..acf85b616 100644 --- a/iw/bootlocwidget.py +++ b/iw/bootlocwidget.py @@ -79,16 +79,6 @@ class BootloaderLocationWidget: self.widget = alignment def editDriveOrder(self, *args): - # we only support this for grub - if not self.usingGrub: - self.intf.messageWindow(_("Unable to Change Drive Order for LILO"), - _("We do not support changing the " - "drive order for use with LILO."), - type="ok") - return - - - dialog = gtk.Dialog(_("Edit Drive Order"), flags = gtk.DIALOG_MODAL) gui.addFrame(dialog) dialog.set_modal(gtk.TRUE) diff --git a/kickstart.py b/kickstart.py index 39e558336..a5c17d0d7 100644 --- a/kickstart.py +++ b/kickstart.py @@ -336,10 +336,9 @@ class KickstartBase(BaseInstallClass): self.skipSteps.append("authentication") - def doBootloader (self, id, args, useLilo = 0): + def doBootloader (self, id, args): (args, extra) = isys.getopt(args, '', - [ 'append=', 'location=', 'useLilo', 'lba32', - 'password=', 'md5pass=', 'linear', 'nolinear', + [ 'append=', 'location=', 'lba32', 'password=', 'md5pass=', 'upgrade', 'driveorder=']) validLocations = [ "mbr", "partition", "none", "boot" ] @@ -348,7 +347,6 @@ class KickstartBase(BaseInstallClass): password = None md5pass = None forceLBA = 0 - linear = 1 upgrade = 0 driveorder = [] @@ -358,13 +356,6 @@ class KickstartBase(BaseInstallClass): appendLine = arg elif str == '--location': location = arg - elif str == '--useLilo': -# log("used deprecated option --useLilo, ignoring") - useLilo = 1 - elif str == '--linear': - linear = 1 - elif str == '--nolinear': - linear = 0 elif str == '--lba32': forceLBA = 1 elif str == '--password': @@ -395,16 +386,13 @@ class KickstartBase(BaseInstallClass): self.skipSteps.append("instbootloader") else: self.showSteps.append("bootloadersetup") - self.setBootloader(id, useLilo, location, linear, forceLBA, - password, md5pass, appendLine, driveorder) + self.setBootloader(id, location, forceLBA, password, md5pass, + appendLine, driveorder) self.skipSteps.append("upgbootloader") self.skipSteps.append("bootloader") self.skipSteps.append("bootloaderadvanced") - def doLilo (self, id, args): - self.doBootloader(id, args, useLilo = 1) - def doFirstboot(self, id, args): (args, extra) = isys.getopt(args, '', ['reconfig', 'enable', 'enabled', @@ -423,19 +411,6 @@ class KickstartBase(BaseInstallClass): id.firstboot = fb - - def doLiloCheck (self, id, args): - drives = isys.hardDriveDict ().keys() - drives.sort(isys.compareDrives) - device = drives[0] - isys.makeDevInode(device, '/tmp/' + device) - fd = os.open('/tmp/' + device, os.O_RDONLY) - os.unlink('/tmp/' + device) - block = os.read(fd, 512) - os.close(fd) - if block[6:10] == "LILO": - sys.exit(0) - def doTimezone(self, id, args): (args, extra) = isys.getopt(args, '', [ 'utc' ]) @@ -701,9 +676,7 @@ class KickstartBase(BaseInstallClass): "keyboard" : self.doKeyboard , "lang" : self.doLang , "langsupport" : self.doLangSupport , - "lilo" : self.doLilo , "bootloader" : self.doBootloader , - "lilocheck" : self.doLiloCheck , "mouse" : self.doMouse , "network" : self.doNetwork , "nfs" : None , diff --git a/packages.py b/packages.py index b26dec180..d7aab3ae5 100644 --- a/packages.py +++ b/packages.py @@ -691,9 +691,7 @@ def handleMiscPackages(intf, id, dir): if id.auth.useSamba: select(id.grpset.hdrlist, 'pam_smb') - if iutil.getArch() == "i386" and id.bootloader.useGrubVal == 0: - select(id.grpset.hdrlist, 'lilo') - elif iutil.getArch() == "i386" and id.bootloader.useGrubVal == 1: + if iutil.getArch() == "i386" and id.bootloader.useGrubVal == 1: select(id.grpset.hdrlist, 'grub') elif iutil.getArch() == "s390": select(id.grpset.hdrlist, 's390utils') @@ -1366,7 +1364,7 @@ def setFileCons(instPath, partitions): log("setting SELinux contexts for anaconda created files") files = ["/etc/rpm/platform", "/etc/rpm/macros", - "/etc/lilo.conf", "/etc/lilo.conf.anaconda", + "/etc/lilo.conf.anaconda", "/etc/mtab", "/etc/fstab", "/etc/resolv.conf", "/etc/modprobe.conf", "/etc/modprobe.conf~", "/var/log/wtmp", "/var/run/utmp", diff --git a/textw/bootloader_text.py b/textw/bootloader_text.py index ae39d3427..784e3ba61 100644 --- a/textw/bootloader_text.py +++ b/textw/bootloader_text.py @@ -30,23 +30,13 @@ class BootloaderChoiceWindow: if dispatch.stepInSkipList("instbootloader"): useGrub = 0 - useLilo = 0 noBl = 1 - elif not bl.useGrub(): - useGrub = 0 - useLilo = 1 - noBl = 0 else: useGrub = 1 - useLilo = 0 noBl = 0 blradio = RadioGroup() grub = blradio.add(_("Use GRUB Boot Loader"), "grub", useGrub) - if bootloader.showLilo and iutil.getArch() == "i386": - lilo = blradio.add(_("Use LILO Boot Loader"), "lilo", useLilo) - else: - lilo = None skipbl = blradio.add(_("No Boot Loader"), "nobl", noBl) buttons = ButtonBar(screen, [TEXT_OK_BUTTON, TEXT_BACK_BUTTON ] ) @@ -54,8 +44,6 @@ class BootloaderChoiceWindow: "btloadinstall", 1, 5) grid.add(t, 0, 0, (0,0,0,1)) grid.add(grub, 0, 1, (0,0,0,0)) - if lilo is not None: - grid.add(lilo, 0, 2, (0,0,0,0)) grid.add(skipbl, 0, 3, (0,0,0,1)) grid.add(buttons, 0, 4, growx = 1) @@ -88,10 +76,6 @@ class BootloaderChoiceWindow: # kind of a hack... bl.defaultDevice = None - elif blradio.getSelection() == "lilo": - bl.setUseGrub(0) - dispatch.skipStep("instbootloader", 0) - dispatch.skipStep("bootloaderadvanced", 0) else: bl.setUseGrub(1) dispatch.skipStep("instbootloader", 0) diff --git a/tui-tags.txt b/tui-tags.txt index 4b44e849e..4097f9812 100644 --- a/tui-tags.txt +++ b/tui-tags.txt @@ -15,9 +15,6 @@ textw/bootdisk_text.py BootDiskWindow "bootdiskquery" MakeBootDiskWindow "insertbootdisk" -textw/lilo_text.py - LiloAppendWindow "kernelopts" - textw/mouse_text.py MouseDeviceWindow "mousedevice" MouseWindow "mousetype" diff --git a/upgrade.py b/upgrade.py index 3499ba2b9..bdcfbd6cb 100644 --- a/upgrade.py +++ b/upgrade.py @@ -607,22 +607,6 @@ def upgradeFindPackages(intf, method, id, instPath, dir): id.upgradeDeps ="%s%s\n" % (id.upgradeDeps, text) log(text) id.grpset.hdrlist["grub"].select() - if iutil.getArch() == "i386" and not id.bootloader.useGrub(): - log("Upgrade: User selected to use LILO for bootloader") - if id.grpset.hdrlist.has_key("lilo") and not id.grpset.hdrlist["lilo"].isSelected(): - log("Upgrade: lilo is not currently selected to be upgraded") - h = None - try: - h = ts.dbMatch('name', 'lilo').next() - except StopIteration: - pass - if h is None: - text = ("Upgrade: LILO is not already installed on the " - "system, selecting LILO") - id.upgradeDeps ="%s%s\n" % (id.upgradeDeps, text) - log(text) - id.grpset.hdrlist["lilo"].select() - h = None try: |