From c15aa7aea3fa9dccbe79f18e1c362831e5f71f7d Mon Sep 17 00:00:00 2001
From: Florian Friesdorf <flo@chaoflow.net>
Date: Wed, 28 Dec 2011 21:46:48 +0000
Subject: [PATCH] luksroot uses preLVMCommands instead of postDeviceCommands

svn path=/nixos/trunk/; revision=31131
---
 modules/system/boot/luksroot.nix | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/modules/system/boot/luksroot.nix b/modules/system/boot/luksroot.nix
index 0c0e0dc008b..3781e6b13b9 100644
--- a/modules/system/boot/luksroot.nix
+++ b/modules/system/boot/luksroot.nix
@@ -40,11 +40,9 @@ in
 
     boot.initrd.extraUtilsCommandsTest = ''
       $out/bin/cryptsetup --version
-      $out/bin/lvm vgscan --version
-      $out/bin/lvm vgchange --version
     '';
 
-    boot.initrd.postDeviceCommands = ''
+    boot.initrd.preLVMCommands = ''
       # Wait for luksRoot to appear, e.g. if on a usb drive.
       # XXX: copied and adapted from stage-1-init.sh - should be
       # available as a function.
@@ -59,8 +57,6 @@ in
       fi
       # open luksRoot and scan for logical volumes
       cryptsetup luksOpen ${luksRoot} luksroot
-      lvm vgscan
-      lvm vgchange -ay
     '';
 
   };