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

[Michael Tautschnig]

Author: mt
Date: 2010-10-01 16:39:46 +0000 (Fri, 01 Oct 2010)
New Revision: 6093

Removed:
   branches/experimental/patches/setup-storage_encrypt-error-msg
Modified:
   branches/experimental/patches/series
   branches/experimental/patches/setup-storage_preserve-format-all
   branches/experimental/patches/setup-storage_raw-disk
Log:
Updated experimental patches to match current trunk


Modified: branches/experimental/patches/series
===================================================================
--- branches/experimental/patches/series	2010-10-01 16:38:21 UTC (rev 6092)
+++ branches/experimental/patches/series	2010-10-01 16:39:46 UTC (rev 6093)
@@ -16,5 +16,4 @@
 ftar_rm-fix
 setup-storage_raw-disk
 fcopy_symlinks
-setup-storage_encrypt-error-msg
 setup-storage_cryptsetup-passphrase

Deleted: branches/experimental/patches/setup-storage_encrypt-error-msg
===================================================================
--- branches/experimental/patches/setup-storage_encrypt-error-msg	2010-10-01 16:38:21 UTC (rev 6092)
+++ branches/experimental/patches/setup-storage_encrypt-error-msg	2010-10-01 16:39:46 UTC (rev 6093)
@@ -1,18 +0,0 @@
-2010-09-25  Michael Tautschnig  <mt at debian.org>
-
-	* setup-storage/Parser.pm: Clarify error message in case of invalid use of
-		swap/luks (thanks Patrick Schoenfeld for pointing this out).
-Index: trunk/lib/setup-storage/Parser.pm
-===================================================================
---- trunk.orig/lib/setup-storage/Parser.pm
-+++ trunk/lib/setup-storage/Parser.pm	
-@@ -712,7 +712,8 @@
-         mountpoint devices filesystem mount_options mdcreateopts
-         | /^(luks|tmp|swap)\s+/
-         {
--          ($FAI::device eq "CRYPT") or die "Encryted entry invalid in this context\n";
-+          ($FAI::device eq "CRYPT") or
-+            die "Encrypted device spec $1 invalid in context $FAI::device\n";
-           defined ($FAI::configs{CRYPT}) or &FAI::internal_error("CRYPT entry missing");
- 
-           my $vol_id = 0;

Modified: branches/experimental/patches/setup-storage_preserve-format-all
===================================================================
--- branches/experimental/patches/setup-storage_preserve-format-all	2010-10-01 16:38:21 UTC (rev 6092)
+++ branches/experimental/patches/setup-storage_preserve-format-all	2010-10-01 16:39:46 UTC (rev 6093)
@@ -329,7 +329,7 @@
            # set the reference to the current volume
            # the reference is used by all further processing of this config line
            $FAI::partition_pointer = (\%FAI::configs)->{RAID}->{volumes}->{$vol_id};
-@@ -680,13 +751,17 @@
+@@ -681,13 +752,17 @@
            # initialise the new hash
            defined($FAI::configs{$FAI::device}{volumes}{$2}) or
              $FAI::configs{$FAI::device}{volumes}{$2} = {};

Modified: branches/experimental/patches/setup-storage_raw-disk
===================================================================
--- branches/experimental/patches/setup-storage_raw-disk	2010-10-01 16:38:21 UTC (rev 6092)
+++ branches/experimental/patches/setup-storage_raw-disk	2010-10-01 16:39:46 UTC (rev 6093)
@@ -99,7 +99,7 @@
  
      # no further checks for the disk label being msdos have to be performed in
      # this branch, it has been ensured above
-@@ -752,6 +762,12 @@
+@@ -753,6 +763,12 @@
            # initialise a logical partition
            &FAI::init_part_config($item[ 1 ]);
          }
@@ -133,7 +133,7 @@
 ===================================================================
 --- trunk.orig/lib/setup-storage/Volumes.pm
 +++ trunk/lib/setup-storage/Volumes.pm	
-@@ -520,12 +520,17 @@
+@@ -530,12 +530,17 @@
          next unless ($part->{size}->{preserve} || $part->{size}->{resize});
          ($part->{size}->{extended}) and die
            "Preserving extended partitions is not supported; mark all logical partitions instead\n";