[Fai-commit] r5251 - people/michael/experimental/patches

[mt at alioth.debian.org]

Author: mt
Date: 2009-02-08 18:44:27 +0000 (Sun, 08 Feb 2009)
New Revision: 5251

Added:
   people/michael/experimental/patches/setup-storage_partition-too-large-for-disk-error
Modified:
   people/michael/experimental/patches/series
   people/michael/experimental/patches/setup-storage_crypto-for-all-mountspecs
Log:
- fixed bug in parser improvement
- improved error message if disk is smaller than partition


Modified: people/michael/experimental/patches/series
===================================================================
--- people/michael/experimental/patches/series	2009-02-08 12:31:49 UTC (rev 5250)
+++ people/michael/experimental/patches/series	2009-02-08 18:44:27 UTC (rev 5251)
@@ -17,3 +17,4 @@
 aoe-support
 setup-storage_bugfix-virtual
 setup-storage_crypto-for-all-mountspecs
+setup-storage_partition-too-large-for-disk-error

Modified: people/michael/experimental/patches/setup-storage_crypto-for-all-mountspecs
===================================================================
--- people/michael/experimental/patches/setup-storage_crypto-for-all-mountspecs	2009-02-08 12:31:49 UTC (rev 5250)
+++ people/michael/experimental/patches/setup-storage_crypto-for-all-mountspecs	2009-02-08 18:44:27 UTC (rev 5251)
@@ -23,7 +23,7 @@
 -          $FAI::partition_pointer->{encrypt} = 0;
 -        }
 -        | m{^/\S*}
-+    mountpoint: m{^(-|swap|/[^\s\:]*)(:encrypt)}
++    mountpoint: m{^(-|swap|/[^\s\:]*)(:encrypt)?}
          {
            # set the mount point, may include encryption-request
 -          if ($item[ 1 ] =~ m{^(/[^:]*):encrypt$}) {

Added: people/michael/experimental/patches/setup-storage_partition-too-large-for-disk-error
===================================================================
--- people/michael/experimental/patches/setup-storage_partition-too-large-for-disk-error	                        (rev 0)
+++ people/michael/experimental/patches/setup-storage_partition-too-large-for-disk-error	2009-02-08 18:44:27 UTC (rev 5251)
@@ -0,0 +1,17 @@
+2009-02-08  Michael Tautschnig  <mt at debian.org>
+
+	* lib/setup-storage/Sizes.pm: Properly tell the user that the lower bound of a
+		parition size is already too high
+Index: trunk/lib/setup-storage/Sizes.pm
+===================================================================
+--- trunk.orig/lib/setup-storage/Sizes.pm
++++ trunk/lib/setup-storage/Sizes.pm	
+@@ -73,6 +73,8 @@
+     $end = $end * 1024.0 * 1024.0;
+   }
+ 
++  # the user may have specified a partition that is larger than the entire disk
++  ($start <= $size_b) or die "Lower bound of partition size is greater than disk size\n";
+   # make sure that $end >= $start
+   ($end >= $start) or &FAI::internal_error("end < start");
+