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

[Michael Tautschnig]

Author: mt
Date: 2010-09-25 11:34:06 +0000 (Sat, 25 Sep 2010)
New Revision: 6080

Added:
   branches/experimental/patches/setup-storage_encrypt-error-msg
Modified:
   branches/experimental/patches/series
Log:
Improve/fix encrypt error message


Modified: branches/experimental/patches/series
===================================================================
--- branches/experimental/patches/series	2010-09-25 11:14:53 UTC (rev 6079)
+++ branches/experimental/patches/series	2010-09-25 11:34:06 UTC (rev 6080)
@@ -16,3 +16,4 @@
 ftar_rm-fix
 setup-storage_raw-disk
 fcopy_symlinks
+setup-storage_encrypt-error-msg

Added: branches/experimental/patches/setup-storage_encrypt-error-msg
===================================================================
--- branches/experimental/patches/setup-storage_encrypt-error-msg	                        (rev 0)
+++ branches/experimental/patches/setup-storage_encrypt-error-msg	2010-09-25 11:34:06 UTC (rev 6080)
@@ -0,0 +1,18 @@
+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;