summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFrans Pop <elendil@planet.nl>2007-12-31 16:09:33 +0000
committerFrans Pop <elendil@planet.nl>2007-12-31 16:09:33 +0000
commit9b37eb7033bfea9a296e1a406fcf1c34df2b32f1 (patch)
tree044d022af5ed3f3d25947e4c1eabf314e5e577e7
parent8fd8e74dc1fab620506f0d66e8d3ad552f19af12 (diff)
downloadinstallation-guide-9b37eb7033bfea9a296e1a406fcf1c34df2b32f1.zip
Reorder clock/user setup in preconfiguration appendix too
-rw-r--r--debian/changelog2
-rw-r--r--en/appendix/preseed.xml64
2 files changed, 33 insertions, 33 deletions
diff --git a/debian/changelog b/debian/changelog
index 979e3a368..176176187 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -79,7 +79,7 @@ installation-guide (2007xxxx) UNRELEASED; urgency=low
the selected location can be set (as that is a FAQ)
- improve readability of partman section by using separate subsections for
guided and manual partitioning
- * howto: update for changes in the installation procedure.
+ * howto, preseed: update for reordering of the installation procedure.
-- Frans Pop <fjp@debian.org> Sun, 30 Dec 2007 12:59:38 +0100
diff --git a/en/appendix/preseed.xml b/en/appendix/preseed.xml
index 7fc84790a..269ef43f4 100644
--- a/en/appendix/preseed.xml
+++ b/en/appendix/preseed.xml
@@ -858,6 +858,25 @@ d-i mirror/http/proxy string
</sect2>
+ <sect2 id="preseed-time">
+ <title>Clock and time zone setup</title>
+
+<informalexample role="example"><screen>
+# Controls whether or not the hardware clock is set to UTC.
+d-i clock-setup/utc boolean true
+
+# You may set this to any valid setting for $TZ; see the contents of
+# /usr/share/zoneinfo/ for valid values.
+d-i time/zone string US/Eastern
+
+# Controls whether to use NTP to set the clock during the install
+d-i clock-setup/ntp boolean true
+# NTP server to use. The default is almost always fine here.
+#d-i clock-setup/ntp-server ntp.example.com
+</screen></informalexample>
+
+ </sect2>
+
<sect2 id="preseed-partman">
<title>Partitioning</title>
<para>
@@ -1026,21 +1045,22 @@ d-i partman/confirm boolean true
</sect2>
- <sect2 id="preseed-time">
- <title>Clock and time zone setup</title>
+ <sect2 id="preseed-base-installer">
+ <title>Base system installation</title>
+<para>
-<informalexample role="example"><screen>
-# Controls whether or not the hardware clock is set to UTC.
-d-i clock-setup/utc boolean true
+There is actually not very much that can be preseeded for this stage of the
+installation. The only questions asked concern the installation of the kernel.
-# You may set this to any valid setting for $TZ; see the contents of
-# /usr/share/zoneinfo/ for valid values.
-d-i time/zone string US/Eastern
+</para>
-# Controls whether to use NTP to set the clock during the install
-d-i clock-setup/ntp boolean true
-# NTP server to use. The default is almost always fine here.
-#d-i clock-setup/ntp-server ntp.example.com
+<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
+
+# 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
</screen></informalexample>
</sect2>
@@ -1114,26 +1134,6 @@ $ echo "r00tme" | mkpasswd -s -H MD5
</para>
</sect2>
- <sect2 id="preseed-base-installer">
- <title>Base system installation</title>
-<para>
-
-There is actually not very much that can be preseeded for this stage of the
-installation. The only questions asked concern the installation of the kernel.
-
-</para>
-
-<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
-
-# 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
-</screen></informalexample>
-
- </sect2>
-
<sect2 id="preseed-apt">
<title>Apt setup</title>
<para>