summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFrans Pop <elendil@planet.nl>2009-09-01 17:03:55 +0000
committerFrans Pop <elendil@planet.nl>2009-09-01 17:03:55 +0000
commit72329f82d56b6c5b8764b20d88789b65dc6f519c (patch)
treecde008d62be6250b217e9bb612c61df4609c70d7
parentee7c903d7e21305c57925dcf1626a622c29f7a32 (diff)
downloadinstallation-guide-72329f82d56b6c5b8764b20d88789b65dc6f519c.zip
Note that partman-auto/init_automatically_partition is only honoured if partman-auto/method is not set
Commit previously reverted patch now that freeze is over.
-rw-r--r--debian/changelog4
-rw-r--r--en/appendix/preseed.xml1
2 files changed, 4 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog
index 4230c4941..86de072bd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
installation-guide (2009xxxx) UNRELEASED; urgency=low
- *
+ [ Colin Watson ]
+ * Note that partman-auto/init_automatically_partition is only honoured if
+ partman-auto/method is not set.
-- Frans Pop <fjp@debian.org> Tue, 01 Sep 2009 19:01:59 +0200
diff --git a/en/appendix/preseed.xml b/en/appendix/preseed.xml
index 780c809a1..46606b3b3 100644
--- a/en/appendix/preseed.xml
+++ b/en/appendix/preseed.xml
@@ -963,6 +963,7 @@ correct one will be selected before using preseeding.
<informalexample role="example"><screen>
# If the system has free space you can choose to only partition that space.
+# This is only honoured if partman-auto/method (below) is not set.
#d-i partman-auto/init_automatically_partition select biggest_free
# Alternatively, you can specify a disk to partition. The device name must