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

[Michael Tautschnig]

Author: mt
Date: 2009-10-30 15:01:19 +0000 (Fri, 30 Oct 2009)
New Revision: 5631

Removed:
   people/michael/experimental/patches/setup-storage_lvm-on-entire-disk
Modified:
   people/michael/experimental/patches/series
   people/michael/experimental/patches/setup-storage_exp-version
   people/michael/experimental/patches/setup-storage_full-crypto-support
Log:
merged patch into trunk, updating others as necessary


Modified: people/michael/experimental/patches/series
===================================================================
--- people/michael/experimental/patches/series	2009-10-30 15:00:31 UTC (rev 5630)
+++ people/michael/experimental/patches/series	2009-10-30 15:01:19 UTC (rev 5631)
@@ -5,4 +5,3 @@
 bugfix-479537
 setup-storage_full-crypto-support
 setup-storage_no-cylinder-boundaries
-setup-storage_lvm-on-entire-disk

Modified: people/michael/experimental/patches/setup-storage_exp-version
===================================================================
--- people/michael/experimental/patches/setup-storage_exp-version	2009-10-30 15:00:31 UTC (rev 5630)
+++ people/michael/experimental/patches/setup-storage_exp-version	2009-10-30 15:01:19 UTC (rev 5631)
@@ -9,8 +9,8 @@
  
  package FAI;
  
--my $version = "1.1.1";
-+my $version = "1.1.1+exp";
+-my $version = "1.1.2";
++my $version = "1.1.2+exp";
  
  # command line parameter handling
  use Getopt::Std;

Modified: people/michael/experimental/patches/setup-storage_full-crypto-support
===================================================================
--- people/michael/experimental/patches/setup-storage_full-crypto-support	2009-10-30 15:00:31 UTC (rev 5630)
+++ people/michael/experimental/patches/setup-storage_full-crypto-support	2009-10-30 15:01:19 UTC (rev 5631)
@@ -44,7 +44,7 @@
  
    # add entries to crypttab
    push @FAI::crypttab, "$enc_dev_short_name\t$device\t$keyfile\tluks";
-@@ -203,11 +201,12 @@
+@@ -204,11 +202,12 @@
            next;
          } else {
            if ($vol->{devices}->{$d}->{spare}) {
@@ -59,7 +59,7 @@
          &FAI::set_partition_type_on_phys_dev($d, "raid");
          if ((&FAI::phys_dev($d))[0]) {
            $pre_req .= ",type_raid_$d";
-@@ -301,7 +300,8 @@
+@@ -302,7 +301,8 @@
    # create the volume group, if it doesn't exist already
    if (!$vg_exists) {
      # create all the devices
@@ -69,7 +69,7 @@
      &FAI::erase_lvm_signature(\@devices);
      &FAI::push_command( "pvcreate $pv_create_options $_",
        "pv_sigs_removed,exist_$_", "pv_done_$_") foreach (@devices);
-@@ -323,7 +323,8 @@
+@@ -324,7 +324,8 @@
    # create an undefined entry for each new device
    @new_devs{ keys %{ $FAI::configs{$config}{devices} } } = ();
  
@@ -79,7 +79,7 @@
  
    # &FAI::erase_lvm_signature( \@new_devices );
  
-@@ -462,6 +463,7 @@
+@@ -463,6 +464,7 @@
        foreach (keys %{ $FAI::configs{$config}{devices} });
      my $type_pre = "";
      foreach my $d (keys %{ $FAI::configs{$config}{devices} }) {

Deleted: people/michael/experimental/patches/setup-storage_lvm-on-entire-disk
===================================================================
--- people/michael/experimental/patches/setup-storage_lvm-on-entire-disk	2009-10-30 15:00:31 UTC (rev 5630)
+++ people/michael/experimental/patches/setup-storage_lvm-on-entire-disk	2009-10-30 15:01:19 UTC (rev 5631)
@@ -1,35 +0,0 @@
-2009-10-30  Michael Tautschnig  <mt at debian.org>
-
-	* setup-storage/Parser.pm: LVM volume groups or RAID arrays may now refer to
-		diskX to use the entire disk (thanks Mathieu Alorent).
-Index: trunk/lib/setup-storage/Parser.pm
-===================================================================
---- trunk.orig/lib/setup-storage/Parser.pm
-+++ trunk/lib/setup-storage/Parser.pm	
-@@ -614,6 +614,8 @@
-             unless ($dev =~ m{^/}) {
-               if ($dev =~ m/^disk(\d+)\.(\d+)/) {
-                 $dev = &FAI::make_device_name("/dev/" . $FAI::disks[ $1 - 1 ], $2);
-+              } elsif ($dev =~ m/^disk(\d+)/) {
-+                $dev = "/dev/" . $FAI::disks[ $1 - 1 ];
-               } else {
-                 $dev = "/dev/$dev";
-               }
-Index: trunk/lib/setup-storage/Commands.pm
-===================================================================
---- trunk.orig/lib/setup-storage/Commands.pm
-+++ trunk/lib/setup-storage/Commands.pm	
-@@ -151,9 +151,10 @@
-   # make sure this device really exists (we can't check for the partition
-   # as that may be created later on
-   (-b $disk) or die "Specified disk $disk does not exist in this system!\n";
--  # set the raid flag
--  &FAI::push_command( "parted -s $disk set $part_no $t on", "exist_$d",
--    "type_${t}_$d" );
-+  # set the raid/lvm unless this is an entire disk flag
-+  my $cmd = "parted -s $disk set $part_no $t on";
-+  $cmd = "true" if ($part_no == -1);
-+  &FAI::push_command( $cmd, "exist_$d", "type_${t}_$d" );
- }
- 
- ################################################################################