[Fai-commit] r6091 - trunk/lib/setup-storage

[Michael Tautschnig]

Author: mt
Date: 2010-10-01 16:37:53 +0000 (Fri, 01 Oct 2010)
New Revision: 6091

Modified:
   trunk/lib/setup-storage/Parser.pm
Log:
Clarify error message in case of invalid use of swap/luks in disk_config

setup-storage/Parser.pm: Clarify error message in case of invalid use of
swap/luks (thanks Patrick Schoenfeld for pointing this out).


Modified: trunk/lib/setup-storage/Parser.pm
===================================================================
--- trunk/lib/setup-storage/Parser.pm	2010-10-01 15:50:21 UTC (rev 6090)
+++ trunk/lib/setup-storage/Parser.pm	2010-10-01 16:37:53 UTC (rev 6091)
@@ -613,7 +613,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;