summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--debian/changelog7
-rw-r--r--en/appendix/preseed.xml6
2 files changed, 8 insertions, 5 deletions
diff --git a/debian/changelog b/debian/changelog
index 684544d46..245332e33 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -19,18 +19,17 @@ installation-guide (2007xxxx) UNRELEASED; urgency=low
the manual has translations.
* Document new boot parameters "lowmem" and "dmraid".
* Document new location of graphical mini.iso images.
+ * Document base-installer/kernel/image preseed.
[ Joey Hess ]
* Document new lilo-installer/skip preseed.
+ * Document passwd/user-default-groups preseed.
[ Colin Watson ]
* Recommend preseeding mirror/country to "manual" rather than "enter
information manually" (choose-mirror 2.17).
- [ Joey Hess ]
- * Document passwd/user-default-groups.
-
- -- Joey Hess <joeyh@debian.org> Sat, 23 Jun 2007 02:08:03 +0100
+ -- Frans Pop <fjp@debian.org> Fri, 20 Jul 2007 09:23:10 +0200
installation-guide (20070319) unstable; urgency=low
diff --git a/en/appendix/preseed.xml b/en/appendix/preseed.xml
index 41a059c8e..b8de9c176 100644
--- a/en/appendix/preseed.xml
+++ b/en/appendix/preseed.xml
@@ -1117,7 +1117,11 @@ installation. The only questions asked concern the installation of the kernel.
<informalexample role="example"><screen>
# Select the initramfs generator used to generate the initrd for 2.6 kernels.
-#d-i base-installer/kernel/linux/initramfs-generators string yaird
+#d-i base-installer/kernel/linux/initramfs-generators string yaird<phrase condition="lenny">
+
+# The kernel image (meta) package to be installed; "none" can be used if no
+# kernel is to be installed.
+#d-i base-installer/kernel/image linux-image-2.6-486</phrase>
</screen></informalexample>
</sect2>