diff options
| author |   Preston Cody <codeman@gentoo.org> | 2007-03-23 03:30:31 +0000 |
|---|---|---|
| committer | Preston Cody <codeman@gentoo.org> | 2007-03-23 03:30:31 +0000 |
| commit | c907489ce62a5d2d8dea4ad7571a499406fc0f94 (patch) | |
| tree | c5718fffaa3fcb92d64ffeb4705ce542842d2654 | |
| parent | adding Finnish translations provided by Flammie Pirinen <flammie@gentoo.org> (diff) | |
| download | gli-c907489ce62a5d2d8dea4ad7571a499406fc0f94.tar.gz gli-c907489ce62a5d2d8dea4ad7571a499406fc0f94.tar.bz2 gli-c907489ce62a5d2d8dea4ad7571a499406fc0f94.zip | |
fix none entry for bootloader.
add recommended line for gentoo-sources
git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/gli/branches/overhaul@1824 f8877401-5920-0410-a79b-8e2d7e04ca0d
| -rwxr-xr-x | src/fe/dialog/gli-dialog.py | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/src/fe/dialog/gli-dialog.py b/src/fe/dialog/gli-dialog.py index 79e2b72..92c5c2f 100755 --- a/src/fe/dialog/gli-dialog.py +++ b/src/fe/dialog/gli-dialog.py @@ -1070,7 +1070,7 @@ Press OK to continue""") # This section will be for choosing kernel sources, choosing (and specifying) a custom config or genkernel, modules to load at startup, etc. kernel_sources = [("livecd-kernel", _(u"Copy over the current running kernel (fastest)")), ("vanilla-sources", _(u"The Unaltered Linux Kernel ver 2.6+ (safest)")), - ("gentoo-sources", _(u"Gentoo's optimized 2.6+ kernel. (less safe)")), + ("gentoo-sources", _(u"Gentoo's optimized 2.6+ kernel. (less safe)")+" (RECOMMENDED)"), #FIXME LANGUAGE ("hardened-sources", _(u"Hardened sources for the 2.6 kernel tree")), ("grsec-sources",_(u"Vanilla sources with grsecurity patches")), (_(u"Other"), _(u"Choose one of the other sources available."))] @@ -1136,11 +1136,10 @@ Press OK to continue""") for drive in self._drives: boot_drive_choices.append((drive, self._devices[drive].get_model())) arch_loaders = { 'x86': [ - ("grub",_(u"GRand Unified Bootloader, newer, RECOMMENDED"))], + ("grub",_(u"GRand Unified Bootloader, newer, RECOMMENDED")), + ("lilo",_(u"LInux LOader, older, traditional.(detects windows partitions)"))], 'amd64': [ ("grub",_(u"GRand Unified Bootloader, newer, RECOMMENDED"))]} #FIXME ADD OTHER ARCHS - if not self.networkless: - arch_loaders['x86'].append(("lilo",_(u"LInux LOader, older, traditional.(detects windows partitions)"))) boot_loaders = arch_loaders[self._arch] boot_loaders.append(("none", _(u"Do not install a bootloader. (System may be unbootable!)"))) boot_string1 = _(u"To boot successfully into your new Linux system, a bootloader will be needed. If you already have a bootloader you want to use you can select None here. The bootloader choices available are dependent on what GLI supports and what architecture your system is. Choose a bootloader") @@ -1151,7 +1150,9 @@ Press OK to continue""") self._install_profile.set_boot_loader_pkg(None, menuitem, None) except: self._d.msgbox(_(u"ERROR! Could not set boot loader pkg! ")+menuitem) - if menuitem != "none" and self.advanced_mode: + if menuitem == "none": + return + if self.advanced_mode: #Reset the Yes/No labels. self._d.add_persistent_args(["--yes-label", _(u"Yes")]) self._d.add_persistent_args(["--no-label",_(u"No")]) |