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

[Michael Tautschnig]

Author: mt
Date: 2011-05-01 23:17:13 +0000 (Sun, 01 May 2011)
New Revision: 6518

Added:
   branches/experimental/patches/setup-storage_man-page-align
Modified:
   branches/experimental/patches/ftar_rm-fix
   branches/experimental/patches/make-fai-nfsroot_add-keys
   branches/experimental/patches/series
Log:
Match current trunk, added setup-storage man-page improvement


Modified: branches/experimental/patches/ftar_rm-fix
===================================================================
--- branches/experimental/patches/ftar_rm-fix	2011-05-01 23:16:03 UTC (rev 6517)
+++ branches/experimental/patches/ftar_rm-fix	2011-05-01 23:17:13 UTC (rev 6518)
@@ -21,7 +21,7 @@
 +        removedir=0
 +    fi
 +
-     echo "ftar: extracting $file to $target/$dir"
+     echo "ftar: extracting $file to $target/$dir" | tr -s '/'
      $catname $file | tar -C $target/$dir $vflag -xf -
      tardone=1
 @@ -114,14 +126,6 @@

Modified: branches/experimental/patches/make-fai-nfsroot_add-keys
===================================================================
--- branches/experimental/patches/make-fai-nfsroot_add-keys	2011-05-01 23:16:03 UTC (rev 6517)
+++ branches/experimental/patches/make-fai-nfsroot_add-keys	2011-05-01 23:17:13 UTC (rev 6518)
@@ -7,7 +7,7 @@
 ===================================================================
 --- trunk.orig/bin/make-fai-nfsroot
 +++ trunk/bin/make-fai-nfsroot
-@@ -383,6 +383,15 @@
+@@ -402,6 +402,15 @@
      mount -t proc   /proc  $NFSROOT/proc
      mount -t sysfs  /sys   $NFSROOT/sys
      mount -t devpts devpts $NFSROOT/dev/pts

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

Added: branches/experimental/patches/setup-storage_man-page-align
===================================================================
--- branches/experimental/patches/setup-storage_man-page-align	                        (rev 0)
+++ branches/experimental/patches/setup-storage_man-page-align	2011-05-01 23:17:13 UTC (rev 6518)
@@ -0,0 +1,20 @@
+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.