summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--debian/changelog5
-rw-r--r--en/appendix/preseed.xml11
2 files changed, 14 insertions, 2 deletions
diff --git a/debian/changelog b/debian/changelog
index 19431488d..001a6d613 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -30,7 +30,10 @@ installation-guide (2006XXXX) UNRELEASED; urgency=low
* Remove obsolete substvar.
* Build-depend on libhtml-parser-perl for build/preseed.pl.
- -- Frans Pop <fjp@debian.org> Wed, 4 Jan 2006 23:03:45 +0100
+ [ Joey Hess ]
+ * Add docs about preseeding a fallback to a static IP if dhcp fails.
+
+ -- Joey Hess <joeyh@debian.org> Wed, 18 Jan 2006 15:55:36 -0500
installation-guide (20060102) unstable; urgency=low
diff --git a/en/appendix/preseed.xml b/en/appendix/preseed.xml
index 539161d0d..a5f1f2dc2 100644
--- a/en/appendix/preseed.xml
+++ b/en/appendix/preseed.xml
@@ -509,8 +509,17 @@ d-i netcfg/choose_interface select auto
# it, this might be useful.
#d-i netcfg/dhcp_timeout string 60
-# If you prefer to configure the network manually, here's how:
+# If you prefer to configure the network manually, uncomment this line and
+# the static network configuration below.
#d-i netcfg/disable_dhcp boolean true
+
+# If you want the preseed file to work on systems both with and without
+# a dhcp server, uncomment these lines and the static network configuration
+# below.
+#d-i netcfg/dhcp_failed note
+#d-i netcfg/dhcp_options select Configure network manually
+
+# Static network configuration.
#d-i netcfg/get_nameservers string 192.168.1.1
#d-i netcfg/get_ipaddress string 192.168.1.42
#d-i netcfg/get_netmask string 255.255.255.0