diff options
| -rw-r--r-- | debian/changelog | 3 | ||||
| -rw-r--r-- | en/appendix/preseed.xml | 2 | ||||
| -rw-r--r-- | en/partitioning/schemes.xml | 2 | ||||
| -rw-r--r-- | en/partitioning/tree.xml | 10 | ||||
| -rw-r--r-- | en/using-d-i/modules/partman.xml | 4 |
5 files changed, 17 insertions, 4 deletions
diff --git a/debian/changelog b/debian/changelog index 082a739b2..c488cfcc8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -25,6 +25,9 @@ installation-guide (201409xx) UNRELEASED; urgency=medium * Fix documentation for -- after it was turned into --- for fixing #764675. * Explicit that console=ttyS0,something has to be put after ---. + [ Baptiste Jammet ] + * Update installation-guide for no separated /usr. Closes: #772461. + -- Samuel Thibault <sthibault@debian.org> Tue, 16 Sep 2014 13:24:16 +0200 installation-guide (20140916) unstable; urgency=low diff --git a/en/appendix/preseed.xml b/en/appendix/preseed.xml index cfbf9706e..385fa9c95 100644 --- a/en/appendix/preseed.xml +++ b/en/appendix/preseed.xml @@ -1153,7 +1153,7 @@ d-i partman-lvm/confirm_nooverwrite boolean true # You can choose one of the three predefined partitioning recipes: # - atomic: all files in one partition # - home: separate /home partition -# - multi: separate /home, /usr, /var, and /tmp partitions +# - multi: separate /home, /var, and /tmp partitions d-i partman-auto/choose_recipe select atomic # Or provide a recipe of your own... diff --git a/en/partitioning/schemes.xml b/en/partitioning/schemes.xml index eaebab2bb..56ded9fba 100644 --- a/en/partitioning/schemes.xml +++ b/en/partitioning/schemes.xml @@ -16,7 +16,7 @@ and this can cause delays during booting when the partition is large. </para><para> For multi-user systems or systems with lots of disk space, it's best -to put <filename>/usr</filename>, <filename>/var</filename>, +to put <filename>/var</filename>, <filename>/tmp</filename>, and <filename>/home</filename> each on their own partitions separate from the <filename>/</filename> partition. diff --git a/en/partitioning/tree.xml b/en/partitioning/tree.xml index d3d13e96d..6597108eb 100644 --- a/en/partitioning/tree.xml +++ b/en/partitioning/tree.xml @@ -115,6 +115,16 @@ to install. A generous workstation or server installation should allow </para></listitem> <listitem><para> +It is now recommended to have <filename>/usr</filename> on the +root partition <filename>/</filename>, otherwise it could +cause some trouble at boot time. +This means that you should provide at least 600–750MB of disk space +for the root partition including <filename>/usr</filename>, or 5–6GB +for a workstation or a server installation. + +</para></listitem> +<listitem><para> + <filename>/var</filename>: variable data like news articles, e-mails, web sites, databases, the packaging system cache, etc. will be placed under this directory. The size of this directory depends greatly on diff --git a/en/using-d-i/modules/partman.xml b/en/using-d-i/modules/partman.xml index b3b97cc21..89399845d 100644 --- a/en/using-d-i/modules/partman.xml +++ b/en/using-d-i/modules/partman.xml @@ -276,11 +276,11 @@ partitioning will fail. <filename>/</filename>, <filename>/home</filename>, swap </entry> </row><row> - <entry>Separate /home, /usr, /var and /tmp partitions</entry> + <entry>Separate /home, /var and /tmp partitions</entry> <entry>1GB</entry> <entry> <filename>/</filename>, <filename>/home</filename>, - <filename>/usr</filename>, <filename>/var</filename>, + <filename>/var</filename>, <filename>/tmp</filename>, swap </entry> </row> |