Disable ld.so.preload while building

lomorage · Sep 13, 2019 · 123f8f6 · 123f8f6
1 parent 40a74ef
commit 123f8f6
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 0 deletions.
diff --git a/export-image/00-allow-rerun/00-run.sh b/export-image/00-allow-rerun/00-run.sh
@@ -3,3 +3,7 @@
 if [ ! -x "${ROOTFS_DIR}/usr/bin/qemu-arm-static" ]; then
 	cp /usr/bin/qemu-arm-static "${ROOTFS_DIR}/usr/bin/"
 fi
+
+if [ -e "${ROOTFS_DIR}/etc/ld.so.preload" ]; then
+	mv "${ROOTFS_DIR}/etc/ld.so.preload" "${ROOTFS_DIR}/etc/ld.so.preload.disabled"
+fi
diff --git a/export-image/04-finalise/01-run.sh b/export-image/04-finalise/01-run.sh
@@ -15,6 +15,12 @@ fi
 rm -f "${ROOTFS_DIR}/etc/apt/apt.conf.d/51cache"
 rm -f "${ROOTFS_DIR}/usr/bin/qemu-arm-static"
 
+if [ "${USE_QEMU}" != "1" ]; then
+	if [ -e "${ROOTFS_DIR}/etc/ld.so.preload.disabled" ]; then
+		mv "${ROOTFS_DIR}/etc/ld.so.preload.disabled" "${ROOTFS_DIR}/etc/ld.so.preload"
+	fi
+fi
+
 rm -f "${ROOTFS_DIR}/etc/network/interfaces.dpkg-old"
 
 rm -f "${ROOTFS_DIR}/etc/apt/sources.list~"

diff --git a/stage2/00-copies-and-fills/02-run.sh b/stage2/00-copies-and-fills/02-run.sh
@@ -0,0 +1,3 @@
+#!/bin/bash -e
+
+mv "${ROOTFS_DIR}/etc/ld.so.preload" "${ROOTFS_DIR}/etc/ld.so.preload.disabled"
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		#!/bin/bash -e

		mv "${ROOTFS_DIR}/etc/ld.so.preload" "${ROOTFS_DIR}/etc/ld.so.preload.disabled"