summaryrefslogtreecommitdiff
path: root/en/appendix
diff options
context:
space:
mode:
authorFrans Pop <elendil@planet.nl>2007-05-15 13:37:34 +0000
committerFrans Pop <elendil@planet.nl>2007-05-15 13:37:34 +0000
commit15c3af43d1459cb7f552bb0c8bd8c9c40319d13b (patch)
tree316a1842dfbd5f5b145ef1a20231914ed91533eb /en/appendix
parentbb0fb5901bed9ce06b75eabe817bfc330e752745 (diff)
downloadinstallation-guide-15c3af43d1459cb7f552bb0c8bd8c9c40319d13b.zip
Correct order of sections in line with order during installation; no changes in content
Diffstat (limited to 'en/appendix')
-rw-r--r--en/appendix/preseed.xml116
1 files changed, 58 insertions, 58 deletions
diff --git a/en/appendix/preseed.xml b/en/appendix/preseed.xml
index a73b73e88..28691ae50 100644
--- a/en/appendix/preseed.xml
+++ b/en/appendix/preseed.xml
@@ -1030,45 +1030,6 @@ d-i time/zone string US/Eastern
</sect2>
- <sect2 id="preseed-apt">
- <title>Apt setup</title>
-<para>
-
-Setup of the <filename>/etc/apt/sources.list</filename> and basic configuration
-options is fully automated based on your installation method and answers to
-earlier questions. You can optionally add other (local) repositories.
-
-</para>
-
-<informalexample role="example"><screen>
-# You can choose to install non-free and contrib software.
-#d-i apt-setup/non-free boolean true
-#d-i apt-setup/contrib boolean true
-# Uncomment this if you don't want to use a network mirror.
-#d-i apt-setup/use_mirror boolean false
-# Uncomment this to avoid adding security sources, or
-# add a hostname to use a different server than security.debian.org.
-#d-i apt-setup/security_host string
-
-# Additional repositories, local[0-9] available
-#d-i apt-setup/local0/repository string \
-# http://local.server/debian stable main
-#d-i apt-setup/local0/comment string local server
-# Enable deb-src lines
-#d-i apt-setup/local0/source boolean true
-# URL to the public key of the local repository; you must provide a key or
-# apt will complain about the unauthenticated repository and so the
-# sources.list line will be left commented out
-#d-i apt-setup/local0/key string http://local.server/key
-
-# By default the installer requires that repositories be authenticated
-# using a known gpg key. This setting can be used to disable that
-# authentication. Warning: Insecure, not recommended.
-#d-i debian-installer/allow_unauthenticated string true
-</screen></informalexample>
-
- </sect2>
-
<sect2 id="preseed-account">
<title>Account setup</title>
<para>
@@ -1148,29 +1109,41 @@ installation. The only questions asked concern the installation of the kernel.
</sect2>
- <sect2 id="preseed-bootloader">
- <title>Boot loader installation</title>
+ <sect2 id="preseed-apt">
+ <title>Apt setup</title>
+<para>
-<informalexample role="example"><screen>
-# Grub is the default boot loader (for x86). If you want lilo installed
-# instead, uncomment this:
-#d-i grub-installer/skip boolean true
+Setup of the <filename>/etc/apt/sources.list</filename> and basic configuration
+options is fully automated based on your installation method and answers to
+earlier questions. You can optionally add other (local) repositories.
-# This is fairly safe to set, it makes grub install automatically to the MBR
-# if no other operating system is detected on the machine.
-d-i grub-installer/only_debian boolean true
+</para>
-# This one makes grub-installer install to the MBR if it also finds some other
-# OS, which is less safe as it might not be able to boot that other OS.
-d-i grub-installer/with_other_os boolean true
+<informalexample role="example"><screen>
+# You can choose to install non-free and contrib software.
+#d-i apt-setup/non-free boolean true
+#d-i apt-setup/contrib boolean true
+# Uncomment this if you don't want to use a network mirror.
+#d-i apt-setup/use_mirror boolean false
+# Uncomment this to avoid adding security sources, or
+# add a hostname to use a different server than security.debian.org.
+#d-i apt-setup/security_host string
-# Alternatively, if you want to install to a location other than the mbr,
-# uncomment and edit these lines:
-#d-i grub-installer/only_debian boolean false
-#d-i grub-installer/with_other_os boolean false
-#d-i grub-installer/bootdev string (hd0,0)
-# To install grub to multiple disks:
-#d-i grub-installer/bootdev string (hd0,0) (hd1,0) (hd2,0)
+# Additional repositories, local[0-9] available
+#d-i apt-setup/local0/repository string \
+# http://local.server/debian stable main
+#d-i apt-setup/local0/comment string local server
+# Enable deb-src lines
+#d-i apt-setup/local0/source boolean true
+# URL to the public key of the local repository; you must provide a key or
+# apt will complain about the unauthenticated repository and so the
+# sources.list line will be left commented out
+#d-i apt-setup/local0/key string http://local.server/key
+
+# By default the installer requires that repositories be authenticated
+# using a known gpg key. This setting can be used to disable that
+# authentication. Warning: Insecure, not recommended.
+#d-i debian-installer/allow_unauthenticated string true
</screen></informalexample>
</sect2>
@@ -1259,6 +1232,33 @@ to be used easily on the kernel command line as well.
</sect2>
+ <sect2 id="preseed-bootloader">
+ <title>Boot loader installation</title>
+
+<informalexample role="example"><screen>
+# Grub is the default boot loader (for x86). If you want lilo installed
+# instead, uncomment this:
+#d-i grub-installer/skip boolean true
+
+# This is fairly safe to set, it makes grub install automatically to the MBR
+# if no other operating system is detected on the machine.
+d-i grub-installer/only_debian boolean true
+
+# This one makes grub-installer install to the MBR if it also finds some other
+# OS, which is less safe as it might not be able to boot that other OS.
+d-i grub-installer/with_other_os boolean true
+
+# Alternatively, if you want to install to a location other than the mbr,
+# uncomment and edit these lines:
+#d-i grub-installer/only_debian boolean false
+#d-i grub-installer/with_other_os boolean false
+#d-i grub-installer/bootdev string (hd0,0)
+# To install grub to multiple disks:
+#d-i grub-installer/bootdev string (hd0,0) (hd1,0) (hd2,0)
+</screen></informalexample>
+
+ </sect2>
+
<sect2 id="preseed-finish">
<title>Finishing up the first stage install</title>