[Fai-commit] r6521 - branches/experimental/patches

[Michael Tautschnig]

Author: mt
Date: 2011-05-01 23:36:55 +0000 (Sun, 01 May 2011)
New Revision: 6521

Removed:
   branches/experimental/patches/setup-storage_man-page-align
Modified:
   branches/experimental/patches/series
Log:
Merged patch into trunk


Modified: branches/experimental/patches/series
===================================================================
--- branches/experimental/patches/series	2011-05-01 23:36:03 UTC (rev 6520)
+++ branches/experimental/patches/series	2011-05-01 23:36:55 UTC (rev 6521)
@@ -15,4 +15,3 @@
 setup-storage_virtual-bugfix
 setup-storage_dont-create-current-config
 setup-storage_more-verbose-parser
-setup-storage_man-page-align

Deleted: branches/experimental/patches/setup-storage_man-page-align
===================================================================
--- branches/experimental/patches/setup-storage_man-page-align	2011-05-01 23:36:03 UTC (rev 6520)
+++ branches/experimental/patches/setup-storage_man-page-align	2011-05-01 23:36:55 UTC (rev 6521)
@@ -1,20 +0,0 @@
-2011-05-01  Michael Tautschnig  <mt at debian.org>
-
-	* setup-storage.8: Document alignment strategy of setup-storage.
-Index: trunk/man/setup-storage.8
-===================================================================
---- trunk.orig/man/setup-storage.8
-+++ trunk/man/setup-storage.8
-@@ -696,6 +696,12 @@
- will want to copy these to some removable media. To make encrypted root devices
- actually usable, you need to add busybox (and initramfs-tools) to your package
- config.
-+.IP \(bu
-+For backwards compatibility or other system-specific reasons an alignment to
-+cylinder boundaries may be necessary. Yet other systems will have other
-+alignment constraints. setup-storage sets the alignment as follows: If align-at
-+is set, align accordingly. Otherwise, if any partition on the particular disk is
-+to be preserved, default to cylinder alignment. Else use sector alignment.
- .SH SEE ALSO
- This program is part of FAI (Fully Automatic Installation).
- The FAI homepage is http://fai-project.org.