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

[mt at alioth.debian.org]

Author: mt
Date: 2008-10-01 17:55:37 +0000 (Wed, 01 Oct 2008)
New Revision: 5183

Added:
   people/michael/experimental/patches/setup-storage_large-partition-check
Modified:
   people/michael/experimental/patches/series
   people/michael/experimental/patches/setup-storage_liblinux-lvm
Log:
- added patch to verify that partition sizes on msdos labels are no greater than
  2TB
- depend on liblinux-lvm-perl instead of recommend it


Modified: people/michael/experimental/patches/series
===================================================================
--- people/michael/experimental/patches/series	2008-10-01 12:20:53 UTC (rev 5182)
+++ people/michael/experimental/patches/series	2008-10-01 17:55:37 UTC (rev 5183)
@@ -1,3 +1,4 @@
+setup-storage_large-partition-check
 setup-storage_parted-error-msgs
 setup-storage_command-dependencies
 setup-storage_opt-d

Added: people/michael/experimental/patches/setup-storage_large-partition-check
===================================================================
--- people/michael/experimental/patches/setup-storage_large-partition-check	                        (rev 0)
+++ people/michael/experimental/patches/setup-storage_large-partition-check	2008-10-01 17:55:37 UTC (rev 5183)
@@ -0,0 +1,19 @@
+2008-10-01  Michael Tautschnig  <mt at debian.org>
+
+	* lib/setup-storage/Sizes.pm: Immediately fail if partitions > 2TB are to be
+		created on msdos disk labels
+Index: trunk/lib/setup-storage/Sizes.pm
+===================================================================
+--- trunk.orig/lib/setup-storage/Sizes.pm
++++ trunk/lib/setup-storage/Sizes.pm	
+@@ -668,6 +668,10 @@
+         ($next_start, $min_req_total_space) = &FAI::do_partition_real($part_id, 
+           $config, $current_disk, $next_start, $min_req_total_space, \@worklist);
+ 
++        # msdos does not support partitions larger than 2TB
++        ($part->{size}->{eff_size} > (&FAI::convert_unit("2TB") * 1024.0 *
++            1024.0)) and die "msdos disklabel does not support partitions > 2TB, please use disklabel:gpt\n"
++          if ($FAI::configs{$config}{disklabel} eq "msdos");
+         # partition done
+         shift @worklist;
+       }

Modified: people/michael/experimental/patches/setup-storage_liblinux-lvm
===================================================================
--- people/michael/experimental/patches/setup-storage_liblinux-lvm	2008-10-01 12:20:53 UTC (rev 5182)
+++ people/michael/experimental/patches/setup-storage_liblinux-lvm	2008-10-01 17:55:37 UTC (rev 5183)
@@ -21,15 +21,15 @@
 ===================================================================
 --- trunk.orig/debian/control
 +++ trunk/debian/control	
-@@ -13,7 +13,7 @@
+@@ -12,7 +12,7 @@
+ Package: fai-client
  Architecture: all
  Section: admin
- Depends: perl, file, libapt-pkg-perl, libparse-recdescent-perl
--Recommends: debconf-utils, cfengine2
-+Recommends: debconf-utils, cfengine2, liblinux-lvm-perl
+-Depends: perl, file, libapt-pkg-perl, libparse-recdescent-perl
++Depends: perl, file, libapt-pkg-perl, libparse-recdescent-perl, liblinux-lvm-perl
+ Recommends: debconf-utils, cfengine2
  Suggests: ntfsprogs, dmsetup, cryptsetup, logtail
  Conflicts: fai, fai-kernels
- Replaces: fai
 Index: trunk/lib/setup-storage/Volumes.pm
 ===================================================================
 --- trunk.orig/lib/setup-storage/Volumes.pm