From 0a9f3a36eceee02ca94b2c557f1ccad6dae62c92 Mon Sep 17 00:00:00 2001
From: Florian Friesdorf <flo@chaoflow.net>
Date: Wed, 28 Dec 2011 21:46:42 +0000
Subject: [PATCH] luksroot waits for usb drive

svn path=/nixos/trunk/; revision=31129
---
 modules/system/boot/luksroot.nix | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/modules/system/boot/luksroot.nix b/modules/system/boot/luksroot.nix
index a7608014d00..0c0e0dc008b 100644
--- a/modules/system/boot/luksroot.nix
+++ b/modules/system/boot/luksroot.nix
@@ -45,6 +45,19 @@ in
     '';
 
     boot.initrd.postDeviceCommands = ''
+      # 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.
+      if ! test -e ${luksRoot}; then
+          echo -n "waiting for device ${luksRoot} to appear..."
+          for ((try = 0; try < 10; try++)); do
+              sleep 1
+              if test -e ${luksRoot}; then break; fi
+              echo -n "."
+          done
+          echo "ok"
+      fi
+      # open luksRoot and scan for logical volumes
       cryptsetup luksOpen ${luksRoot} luksroot
       lvm vgscan
       lvm vgchange -ay