From c3a5e4a2ee0990be3020f571a22dbb6e37b4490e Mon Sep 17 00:00:00 2001
From: jandob
Date: Fri, 4 Dec 2015 21:39:52 +0100
Subject: fix

---
 builder/dnbd3-rootfs/scripts/rebash | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'builder/dnbd3-rootfs/scripts')

diff --git a/builder/dnbd3-rootfs/scripts/rebash b/builder/dnbd3-rootfs/scripts/rebash
index 8aa0455a..fe79f74b 160000
--- a/builder/dnbd3-rootfs/scripts/rebash
+++ b/builder/dnbd3-rootfs/scripts/rebash
@@ -1 +1 @@
-Subproject commit 8aa0455a428cc4c6ff442c6719043038657549fb
+Subproject commit fe79f74b1d66d5eb010dd186c4d376bd55df5cd9
-- 
cgit v1.2.3-55-g7522


From fc1878a0b88276c7aebeac932cf5106edc0addbe Mon Sep 17 00:00:00 2001
From: jandob
Date: Fri, 4 Dec 2015 22:59:03 +0100
Subject: fix

---
 builder/dnbd3-rootfs/hooks/pre-mount/prepare-root-partition.sh | 2 +-
 builder/dnbd3-rootfs/scripts/rebash                            | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'builder/dnbd3-rootfs/scripts')

diff --git a/builder/dnbd3-rootfs/hooks/pre-mount/prepare-root-partition.sh b/builder/dnbd3-rootfs/hooks/pre-mount/prepare-root-partition.sh
index 490d1a11..dd02b439 100755
--- a/builder/dnbd3-rootfs/hooks/pre-mount/prepare-root-partition.sh
+++ b/builder/dnbd3-rootfs/hooks/pre-mount/prepare-root-partition.sh
@@ -36,7 +36,7 @@ udevadm settle
 local read_only_partition=$(utils.find_block_device \
     "$SLX_SYSTEM_PARTITION_IDENTIFIER" "$nbd_device")
 if [ -z "$read_only_partition" ]; then
-    logging.warn "no partition  with identifier " \
+    logging.warn "no partition with identifier " \
         "'$SLX_SYSTEM_PARTITION_IDENTIFIER' found on device"
     emergency_shell
 fi
diff --git a/builder/dnbd3-rootfs/scripts/rebash b/builder/dnbd3-rootfs/scripts/rebash
index fe79f74b..379686ab 160000
--- a/builder/dnbd3-rootfs/scripts/rebash
+++ b/builder/dnbd3-rootfs/scripts/rebash
@@ -1 +1 @@
-Subproject commit fe79f74b1d66d5eb010dd186c4d376bd55df5cd9
+Subproject commit 379686ab4556cdb9b5929480e11c48cb8d74c364
-- 
cgit v1.2.3-55-g7522


From 3451fc36bfed22a87042724ad8d848dbe67acd6c Mon Sep 17 00:00:00 2001
From: jandob
Date: Sat, 5 Dec 2015 12:04:38 +0100
Subject: improved block device discovery

---
 .../hooks/pre-mount/prepare-root-partition.sh      | 23 +++++++++++++++-------
 builder/dnbd3-rootfs/module-setup.sh               |  2 +-
 builder/dnbd3-rootfs/scripts/rebash                |  2 +-
 3 files changed, 18 insertions(+), 9 deletions(-)

(limited to 'builder/dnbd3-rootfs/scripts')

diff --git a/builder/dnbd3-rootfs/hooks/pre-mount/prepare-root-partition.sh b/builder/dnbd3-rootfs/hooks/pre-mount/prepare-root-partition.sh
index dd02b439..2b266012 100755
--- a/builder/dnbd3-rootfs/hooks/pre-mount/prepare-root-partition.sh
+++ b/builder/dnbd3-rootfs/hooks/pre-mount/prepare-root-partition.sh
@@ -33,17 +33,26 @@ systemd-preserve-process-marker qemu-nbd --connect="$nbd_device" \
 touch $nbd_device
 udevadm settle
 
-local read_only_partition=$(utils.find_block_device \
-    "$SLX_SYSTEM_PARTITION_IDENTIFIER" "$nbd_device")
-if [ -z "$read_only_partition" ]; then
-    logging.warn "no partition with identifier " \
-        "'$SLX_SYSTEM_PARTITION_IDENTIFIER' found on device"
+local read_only_partition
+if ! read_only_partition=$(utils.find_block_device \
+        "$SLX_SYSTEM_PARTITION_IDENTIFIER" "$nbd_device"); then
+    logging.warn "Failed to find unique device with identifier" \
+        "'${SLX_SYSTEM_PARTITION_IDENTIFIER}'; matched devices:" \
+        "'${read_only_partition}'"
     emergency_shell
 fi
+
 # Make read-only partition writable.
+
 ## detect partition for persistent storage
-local persistent_device=$(utils.find_block_device \
-    "$SLX_WRITABLE_DEVICE_IDENTIFIER")
+local persistent_device
+if ! persistent_device=$(utils.find_block_device \
+        "$SLX_WRITABLE_DEVICE_IDENTIFIER"); then
+    logging.warn "Failed to find unique device with identifier" \
+        "'${SLX_WRITABLE_DEVICE_IDENTIFIER}'; matched devices:" \
+        "'${persistent_device}'"
+fi
+
 # TODO move somewhere else
 #local tmp_device="$(utils.find_block_device \
     #'$SLX_TMP_PARTITION_IDENTIFIER')"
diff --git a/builder/dnbd3-rootfs/module-setup.sh b/builder/dnbd3-rootfs/module-setup.sh
index 64452cfe..a00ad048 100755
--- a/builder/dnbd3-rootfs/module-setup.sh
+++ b/builder/dnbd3-rootfs/module-setup.sh
@@ -154,7 +154,7 @@ install() {
         mount fdisk mkfs.xfs env busybox ps agetty \
         insmod qemu-nbd blockdev partx dmsetup sed cut awk tr insmod qemu-nbd \
         blockdev partx dmsetup cat cut awk losetup dd mkfs.ext4 grep \
-        basename dirname
+        basename dirname sort
     # Production:
     # inst_multiple insmod qemu-nbd blockdev partx dmsetup cat cut awk tr \
     #     losetup dd mkfs.ext4 grep
diff --git a/builder/dnbd3-rootfs/scripts/rebash b/builder/dnbd3-rootfs/scripts/rebash
index 379686ab..30c6afbc 160000
--- a/builder/dnbd3-rootfs/scripts/rebash
+++ b/builder/dnbd3-rootfs/scripts/rebash
@@ -1 +1 @@
-Subproject commit 379686ab4556cdb9b5929480e11c48cb8d74c364
+Subproject commit 30c6afbc5afc8ce83ee91f1249e29086d49ce4eb
-- 
cgit v1.2.3-55-g7522