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

[mt at alioth.debian.org]

Author: mt
Date: 2009-02-08 22:38:38 +0000 (Sun, 08 Feb 2009)
New Revision: 5252

Modified:
   people/michael/experimental/patches/setup-storage_crypto-bugfixes
Log:
fixed bug in encryption dependency tracking


Modified: people/michael/experimental/patches/setup-storage_crypto-bugfixes
===================================================================
--- people/michael/experimental/patches/setup-storage_crypto-bugfixes	2009-02-08 18:44:27 UTC (rev 5251)
+++ people/michael/experimental/patches/setup-storage_crypto-bugfixes	2009-02-08 22:38:38 UTC (rev 5252)
@@ -7,6 +7,15 @@
 ===================================================================
 --- trunk.orig/lib/setup-storage/Commands.pm
 +++ trunk/lib/setup-storage/Commands.pm	
+@@ -80,7 +80,7 @@
+   ($fs eq "swap") and $create_tool = "mkswap";
+   ($fs eq "xfs") and $create_options = "$create_options -f" unless ($create_options =~ m/-f/);
+   my $pre_encrypt = "exist_$device";
+-  $pre_encrypt = "encrypt_$device" if ($partition->{encrypt});
++  $pre_encrypt = "encrypted_$device" if ($partition->{encrypt});
+   &FAI::push_command( "$create_tool $create_options $device", $pre_encrypt,
+     "has_fs_$device" );
+ 
 @@ -115,7 +115,7 @@
  
    # encryption requested, rewrite the device name