From 3adc31626659f915b9ae9959c08fba7ef0c80a95 Mon Sep 17 00:00:00 2001
From: Frans Pop <elendil@planet.nl>
Date: Fri, 28 Apr 2006 19:18:18 +0000
Subject: * chroot-install:   - add /etc/hosts to be created for network
 configuration   - make kernel/linux-image variable * Document -- command line
 option for passing parameters to boot loader configuration

---
 debian/changelog               | 7 ++++++-
 en/appendix/chroot-install.xml | 9 +++++----
 en/appendix/preseed.xml        | 8 ++++++++
 3 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index a954149d5..d3756ee93 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,8 +8,13 @@ installation-guide (2006xxxx) UNRELEASED; urgency=low
 
   [ Frans Pop ]
   * Various corrections suggested by Clytie Siddall.
+  * chroot-install:
+    - add /etc/hosts to be created for network configuration (closes: #364517)
+    - make kernel/linux-image variable (closes: #345482)
+  * Document -- command line option for passing parameters to boot loader
+    configuration (closes: #309889).
 
- -- Frans Pop <fjp@debian.org>  Thu, 27 Apr 2006 11:31:52 +0200
+ -- Frans Pop <fjp@debian.org>  Thu, 27 Apr 2006 22:24:08 +0200
 
 installation-guide (20060427) unstable; urgency=low
 
diff --git a/en/appendix/chroot-install.xml b/en/appendix/chroot-install.xml
index 110fd0272..aa15b8dc4 100644
--- a/en/appendix/chroot-install.xml
+++ b/en/appendix/chroot-install.xml
@@ -284,8 +284,9 @@ configured for the next reboot.
 
 To configure networking, edit
 <filename>/etc/network/interfaces</filename>,
-<filename>/etc/resolv.conf</filename>, and
-<filename>/etc/hostname</filename>.
+<filename>/etc/resolv.conf</filename>,
+<filename>/etc/hostname</filename> and
+<filename>/etc/hosts</filename>.
 
 <informalexample><screen>
 # editor /etc/network/interfaces
@@ -380,13 +381,13 @@ If you intend to boot this system, you probably want a Linux kernel
 and a boot loader. Identify available pre-packaged kernels with
 
 <informalexample><screen>
-# apt-cache search kernel-image
+# apt-cache search <phrase condition="classic-kpkg">kernel</phrase><phrase condition="common-kpkg">linux</phrase>-image
 </screen></informalexample>
 
 Then install your choice using its package name.
 
 <informalexample><screen>
-# apt-get install kernel-image-<replaceable>2.X.X-arch-etc</replaceable>
+# apt-get install <phrase condition="classic-kpkg">kernel</phrase><phrase condition="common-kpkg">linux</phrase>-image-<replaceable>&kernelversion;-arch-etc</replaceable>
 </screen></informalexample>
 
 </para>
diff --git a/en/appendix/preseed.xml b/en/appendix/preseed.xml
index df97955f6..a7518d65f 100644
--- a/en/appendix/preseed.xml
+++ b/en/appendix/preseed.xml
@@ -380,6 +380,14 @@ can still be fully automated, since you can pass preseed values to the kernel
 on the command line. Just pass <userinput>path/to/var=value</userinput>
 for any of the preseed variables listed in the examples.
 
+</para><para>
+
+A <quote>&ndash;&ndash;</quote> in the boot options has special meaning.
+Kernel parameters that appear after it will be copied into the installed
+bootloader configuration (if supported by the installer for the
+bootloader). Note that the <quote>&ndash;&ndash;</quote> may already be
+present in the default boot parameters.
+
 </para>
 <note><para>
 
-- 
cgit debian/1.2.3+git2.25.1-1-2-gaceb0