Browse Source

Disable ld.so.preload while building

pull/295/head
Serge Schneider 2 years ago
parent
commit
0cdec86026
3 changed files with 13 additions and 0 deletions
  1. +4
    -0
      export-image/00-allow-rerun/00-run.sh
  2. +6
    -0
      export-image/04-finalise/01-run.sh
  3. +3
    -0
      stage2/00-copies-and-fills/02-run.sh

+ 4
- 0
export-image/00-allow-rerun/00-run.sh View File

@ -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

+ 6
- 0
export-image/04-finalise/01-run.sh View File

@ -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~"

+ 3
- 0
stage2/00-copies-and-fills/02-run.sh View File

@ -0,0 +1,3 @@
#!/bin/bash -e
mv "${ROOTFS_DIR}/etc/ld.so.preload" "${ROOTFS_DIR}/etc/ld.so.preload.disabled"

Loading…
Cancel
Save