summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--debian/changelog6
-rw-r--r--en/appendix/preseed.xml14
2 files changed, 18 insertions, 2 deletions
diff --git a/debian/changelog b/debian/changelog
index f894ddf48..c77c4a70e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+installation-guide (2013XXXX) UNRELEASED; urgency=low
+
+ * Document IPv6 preseeding. Thanks Vincent McIntyre for the suggestion.
+
+ -- Samuel Thibault <sthibault@debian.org> Fri, 22 Feb 2013 01:16:10 +0100
+
installation-guide (20130208) unstable; urgency=low
[ Brian Potkin ]
diff --git a/en/appendix/preseed.xml b/en/appendix/preseed.xml
index ab6de604e..d061af9ad 100644
--- a/en/appendix/preseed.xml
+++ b/en/appendix/preseed.xml
@@ -857,10 +857,11 @@ d-i netcfg/choose_interface select auto
# If you have a slow dhcp server and the installer times out waiting for
# it, this might be useful.
#d-i netcfg/dhcp_timeout string 60
+#d-i netcfg/dhcpv6_timeout string 60
# If you prefer to configure the network manually, uncomment this line and
# the static network configuration below.
-#d-i netcfg/disable_dhcp boolean true
+#d-i netcfg/disable_autoconfig boolean true
# If you want the preconfiguration file to work on systems both with and
# without a dhcp server, uncomment these lines and the static network
@@ -869,10 +870,19 @@ d-i netcfg/choose_interface select auto
#d-i netcfg/dhcp_options select Configure network manually
# Static network configuration.
-#d-i netcfg/get_nameservers string 192.168.1.1
+#
+# IPv4 example
#d-i netcfg/get_ipaddress string 192.168.1.42
#d-i netcfg/get_netmask string 255.255.255.0
#d-i netcfg/get_gateway string 192.168.1.1
+#d-i netcfg/get_nameservers string 192.168.1.1
+#d-i netcfg/confirm_static boolean true
+#
+# IPv6 example
+#d-i netcfg/get_ipaddress string fc00::2
+#d-i netcfg/get_netmask string ffff:ffff:ffff:ffff::
+#d-i netcfg/get_gateway string fc00::1
+#d-i netcfg/get_nameservers string fc00::1
#d-i netcfg/confirm_static boolean true
# Any hostname and domain names assigned from dhcp take precedence over