Merge pull request #95 from moul/fix-94

Automatically attach nbd devices in rescue mode (fix #94)
scaleway · Oct 5, 2015 · 8541662 · 8541662
2 parents 4957eab + 0efb844
commit 8541662
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 0 deletions.
diff --git a/Linux/README.md b/Linux/README.md
@@ -66,6 +66,7 @@ Here are the availble *initrd variables*:
 
 * Made the `initrd` more architecture agnostic to allow testing on Travis [#92](https://github.com/scaleway/initrd/pull/92)
 * Register `xnbd-client` processes to `/run/sendsigs-omit.d/`
+* Automatically attach NBD devices [#94](https://github.com/scaleway/initrd/issues/94)
 
 ### v3.3 (2015-09-07)
 

diff --git a/Linux/tree-common/boot-rescue b/Linux/tree-common/boot-rescue
@@ -6,4 +6,9 @@ mountroot() {
     emount -t tmpfs none "${rootmnt}"
     run sh -ec "wget -qO- '${rescue_image}' | tar -C '${rootmnt}' -x -f -"
     log_end_msg
+
+    log_begin_msg "Attaching nbd devices for easier debugging"
+    attach_nbd_device 0
+    attach_secondary_nbd_devices
+    log_end_msg
 }