From 2939edf4f6447d92cb1643f2bfab5cfe9e76b9c5 Mon Sep 17 00:00:00 2001
From: jandob
Date: Fri, 20 Nov 2015 08:38:02 +0100
Subject: update rebash

---
 builder/dnbd3-rootfs/module-setup.sh | 6 +++++-
 builder/dnbd3-rootfs/scripts/rebash  | 2 +-
 2 files changed, 6 insertions(+), 2 deletions(-)

(limited to 'builder')

diff --git a/builder/dnbd3-rootfs/module-setup.sh b/builder/dnbd3-rootfs/module-setup.sh
index 45122afb..0630ded3 100755
--- a/builder/dnbd3-rootfs/module-setup.sh
+++ b/builder/dnbd3-rootfs/module-setup.sh
@@ -78,6 +78,9 @@ install() {
     # region scripts
 
     inst "$moddir/scripts/utils.sh" "/usr/lib/utils.sh"
+    for file in "$moddir/scripts/rebash/"*; do
+        inst "$file" "/usr/lib/rebash/$(basename $file)"
+    done
     # This script is triggered by udev upon finding the right partitions for
     # persistent sessions.
     inst "$moddir/scripts/prepare-persistent-disks" /sbin/prepare-persistent-disks
@@ -99,7 +102,8 @@ install() {
         lsmod sleep route wget find lsof strace chroot switch_root pivot_root \
         mount fdisk mkfs.xfs env busybox ps agetty \
         insmod qemu-nbd blockdev partx dmsetup sed cut awk insmod qemu-nbd \
-        blockdev partx dmsetup cat cut awk losetup dd mkfs.ext4 grep
+        blockdev partx dmsetup cat cut awk losetup dd mkfs.ext4 grep \
+        basename dirname
     # Production:
     # inst_multiple insmod qemu-nbd blockdev partx dmsetup cat cut awk \
     #     losetup dd mkfs.ext4 grep
diff --git a/builder/dnbd3-rootfs/scripts/rebash b/builder/dnbd3-rootfs/scripts/rebash
index 7d1496d0..93006487 160000
--- a/builder/dnbd3-rootfs/scripts/rebash
+++ b/builder/dnbd3-rootfs/scripts/rebash
@@ -1 +1 @@
-Subproject commit 7d1496d004f0cb6bde1f81626ae259898c466300
+Subproject commit 930064878aee5ff7aa84708c7ac16b729f4808d8
-- 
cgit v1.2.3-55-g7522