[Fai-commit] r6115 - branches/stable/3.4/lib/setup-storage

Michael Prokop mika at alioth.debian.org
Tue Oct 5 15:17:55 UTC 2010


Author: mika
Date: 2010-10-05 15:17:48 +0000 (Tue, 05 Oct 2010)
New Revision: 6115

Modified:
   branches/stable/3.4/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: branches/stable/3.4/lib/setup-storage/Parser.pm
===================================================================
--- branches/stable/3.4/lib/setup-storage/Parser.pm	2010-10-05 15:17:29 UTC (rev 6114)
+++ branches/stable/3.4/lib/setup-storage/Parser.pm	2010-10-05 15:17:48 UTC (rev 6115)
@@ -612,7 +612,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;




More information about the Fai-commit mailing list