From a768e2fc756b570a418afbc2fdbbed0787c0ba17 Mon Sep 17 00:00:00 2001
From: jandob
Date: Sat, 21 Nov 2015 16:19:01 +0100
Subject: integrate rebash into initramfs

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

(limited to 'builder')

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 95ee8fd1..9dfe5e3e 100755
--- a/builder/dnbd3-rootfs/hooks/pre-mount/prepare-root-partition.sh
+++ b/builder/dnbd3-rootfs/hooks/pre-mount/prepare-root-partition.sh
@@ -1,4 +1,8 @@
-source "/usr/lib/utils.sh"
+source "/usr/lib/rebash/core.sh"
+core.import utils
+core.import logging
+logging.set_commands_log_level debug
+logging.set_log_level debug
 
 # Close previous connections to be able to run this script many times.
 dnbd3-client --device "$SLX_DNBD3_DEVICE" --close
@@ -23,7 +27,7 @@ fi
 local nbd_device='/dev/nbd0'
 systemd-preserve-process-marker qemu-nbd --connect="$nbd_device" \
     "$SLX_DNBD3_DEVICE" --read-only
-local read_only_partition="$(utils_create_partition_via_offset "$nbd_device" \
+local read_only_partition="$(utils.create_partition_via_offset "$nbd_device" \
     "$SLX_SYSTEM_PARTITION_LABEL")"
 # Make read-only partition writable.
 # TODO implement persistent available indicator.
diff --git a/builder/dnbd3-rootfs/scripts/rebash b/builder/dnbd3-rootfs/scripts/rebash
index b5a12017..d785bf2a 160000
--- a/builder/dnbd3-rootfs/scripts/rebash
+++ b/builder/dnbd3-rootfs/scripts/rebash
@@ -1 +1 @@
-Subproject commit b5a120174fa31a7bed88eb0985d3702374628493
+Subproject commit d785bf2a558f535baa15d8b9c98c126fa1679c33
-- 
cgit v1.2.3-55-g7522