aboutsummaryrefslogtreecommitdiff
path: root/src/fe
diff options
context:
space:
mode:
authorAndrew Gaffney <agaffney@gentoo.org>2006-02-28 12:51:32 +0000
committerAndrew Gaffney <agaffney@gentoo.org>2006-02-28 12:51:32 +0000
commitd11df60c72b2e4c7c8410b4a160a3228684c3e6b (patch)
tree5cd49ca3e7543a88943443e54fc6df8a8dd0cc49 /src/fe
parent src/GLIPortage.py: (diff)
downloadgli-d11df60c72b2e4c7c8410b4a160a3228684c3e6b.tar.gz
gli-d11df60c72b2e4c7c8410b4a160a3228684c3e6b.tar.bz2
gli-d11df60c72b2e4c7c8410b4a160a3228684c3e6b.zip
remove grsec-sources and references to 'hoser'
git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/gli/trunk@1315 f8877401-5920-0410-a79b-8e2d7e04ca0d
Diffstat (limited to 'src/fe')
-rw-r--r--src/fe/gtk/ExtraPackages.py4
-rw-r--r--src/fe/gtk/Kernel.py2
2 files changed, 3 insertions, 3 deletions
diff --git a/src/fe/gtk/ExtraPackages.py b/src/fe/gtk/ExtraPackages.py
index 5741e50..ac15d48 100644
--- a/src/fe/gtk/ExtraPackages.py
+++ b/src/fe/gtk/ExtraPackages.py
@@ -50,8 +50,8 @@ XSession for fluxbox) in the Other Settings screen.
This is where you emerge extra packages that your system may need. Packages that
are fetch-restricted (e.g. sun-jdk) or require you to accept licenses (e.g. many
big games) will cause your install to fail. Add additional packages with
-caution, you hoser. These trouble packages can be installed manually after you
-reboot."""
+caution. These trouble packages can be installed manually after you reboot.
+"""
# pack the description
self.vert.pack_start(gtk.Label(content_str), expand=False, fill=False, padding=5)
diff --git a/src/fe/gtk/Kernel.py b/src/fe/gtk/Kernel.py
index 1b3ed3e..2d3cb1a 100644
--- a/src/fe/gtk/Kernel.py
+++ b/src/fe/gtk/Kernel.py
@@ -14,7 +14,7 @@ class Panel(GLIScreen.GLIScreen):
sources = [("gentoo-sources", "These are the vanilla sources patched with the Gentoo patchset. These are generally considered stable."),
("vanilla-sources", "These are the kernel sources straight from kernel.org without patches (except where necessary)"),
("hardened-sources", "These are the vanilla sources patched with the hardened patchset. This results in a more secure system. Do not use these unless you have read the hardened guide first."),
- ("grsec-sources", "These are the vanilla sources patched with the grsecurity patchset. Do not use these unless you wear a tinfoil hat and think the government is out to get you."),
+# ("grsec-sources", "These are the vanilla sources patched with the grsecurity patchset. Do not use these unless you wear a tinfoil hat and think the government is out to get you."),
("livecd-kernel", "This will install the LiveCD's kernel/initrd into your new system. Use this option to get your system up and running quickly. You should not tell the installer to emerge any packages that require kernel sources as they won't be present.")]
_helptext = """
<b><u>Choosing a Kernel</u></b>