Bug#772461: Update installation-guide for no separated /usr

[Baptiste Jammet]

Package: installation-guide
Tags: patch

Hi all,

I've noticed this change (some times ago now ...) :

> partman-auto (123) unstable; urgency=medium
> .
>   [ Ben Hutchings ]
>   * Combine / and /usr partitions in 'multi' recipes. Closes: #652275

I think that this will need some rewording in the installation manual.
I've found some references to /usr and tried to adapt them, see
attached patch. (build OK)
Thanks for your comments.

Baptiste

Index: en/using-d-i/modules/partman.xml
===================================================================
--- en/using-d-i/modules/partman.xml	(révision 69499)
+++ en/using-d-i/modules/partman.xml	(copie de travail)
@@ -276,11 +276,11 @@
     <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>
Index: en/partitioning/tree.xml
===================================================================
--- en/partitioning/tree.xml	(révision 69499)
+++ en/partitioning/tree.xml	(copie de travail)
@@ -99,7 +99,8 @@
 <filename>/dev</filename>, otherwise you won't be able to boot.
 Typically 150&ndash;250MB is needed for the root partition.
 
-</para></listitem>
+</para>
+<itemizedlist>
 <listitem><para>
 
 <filename>/usr</filename>: contains all user programs
@@ -113,6 +114,17 @@
 4&ndash;6GB.
 
 </para></listitem>
+</itemizedlist>
+<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&ndash;750MB of disk space
+for the root partition including <filename>/usr</filename>, or 5&ndash;6GB 
+for a workstation or a server installation.
+
+</para></listitem>
 <listitem><para>
 
 <filename>/var</filename>: variable data like news articles, e-mails,
Index: en/partitioning/schemes.xml
===================================================================
--- en/partitioning/schemes.xml	(révision 69499)
+++ en/partitioning/schemes.xml	(copie de travail)
@@ -16,7 +16,7 @@
 </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.
Index: en/appendix/preseed.xml
===================================================================
--- en/appendix/preseed.xml	(révision 69499)
+++ en/appendix/preseed.xml	(copie de travail)
@@ -1153,7 +1153,7 @@
 # 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...

signature.asc
Description: PGP signature