From 5c3eb14e072de2549e89073b002ac072fd4b35dc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Thu, 28 Aug 2014 09:20:40 +0200
Subject: [PATCH] linux-initrd: Wait a bit longer for partitions to appear.

Reported by Sveltana on #guix.

* guix/build/linux-initrd.scm (canonicalize-device-spec): Increase
  MAX-TRIALS.  Add "waiting for partition" 'format' call.
---
 guix/build/linux-initrd.scm | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/guix/build/linux-initrd.scm b/guix/build/linux-initrd.scm
index bce289987b..d37da9a6ff 100644
--- a/guix/build/linux-initrd.scm
+++ b/guix/build/linux-initrd.scm
@@ -229,8 +229,11 @@ the following:
   • 'any', in which case SPEC can be anything.
 "
   (define max-trials
-    ;; Number of times we retry partition label resolution.
-    7)
+    ;; Number of times we retry partition label resolution, 1 second per
+    ;; trial.  Note: somebody reported a delay of 16 seconds (!) before their
+    ;; USB key would be detected by the kernel, so we must wait for at least
+    ;; this long.
+    20)
 
   (define canonical-title
     ;; The realm of canonicalization.
@@ -254,6 +257,8 @@ the following:
              (if (> count max-trials)
                  (error "failed to resolve partition label" spec)
                  (begin
+                   (format #t "waiting for partition '~a' to appear...~%"
+                           spec)
                    (sleep 1)
                    (loop (+ 1 count))))))))
     ;; TODO: Add support for UUIDs.