diff --git a/export-image/00-allow-rerun/00-run.sh b/export-image/00-allow-rerun/00-run.sh index 1355b2e..b77c30e 100755 --- a/export-image/00-allow-rerun/00-run.sh +++ b/export-image/00-allow-rerun/00-run.sh @@ -1,13 +1,5 @@ #!/bin/bash -e -if [ -e ${ROOTFS_DIR}/etc/ld.so.preload ]; then - mv ${ROOTFS_DIR}/etc/ld.so.preload ${ROOTFS_DIR}/etc/ld.so.preload.disabled -fi - -if [ ! -e ${ROOTFS_DIR}/usr/sbin/policy-rc.d ]; then - install -m 744 files/policy-rc.d ${ROOTFS_DIR}/usr/sbin/ -fi - if [ ! -x ${ROOTFS_DIR}/usr/bin/qemu-arm-static ]; then cp /usr/bin/qemu-arm-static ${ROOTFS_DIR}/usr/bin/ fi diff --git a/export-image/00-allow-rerun/files/policy-rc.d b/export-image/00-allow-rerun/files/policy-rc.d deleted file mode 100644 index 1924710..0000000 --- a/export-image/00-allow-rerun/files/policy-rc.d +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh - -exit 101 diff --git a/export-image/04-finalise/01-run.sh b/export-image/04-finalise/01-run.sh index f04c7ee..b093f01 100755 --- a/export-image/04-finalise/01-run.sh +++ b/export-image/04-finalise/01-run.sh @@ -13,13 +13,7 @@ if [ -d ${ROOTFS_DIR}/home/pi/.config ]; then fi rm -f ${ROOTFS_DIR}/etc/apt/apt.conf.d/51cache -rm -f ${ROOTFS_DIR}/usr/sbin/policy-rc.d 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/apt/sources.list~ rm -f ${ROOTFS_DIR}/etc/apt/trusted.gpg~ diff --git a/stage1/01-sys-tweaks/00-run.sh b/stage1/01-sys-tweaks/00-run.sh index 53a1b2b..4454056 100755 --- a/stage1/01-sys-tweaks/00-run.sh +++ b/stage1/01-sys-tweaks/00-run.sh @@ -2,7 +2,6 @@ install -d ${ROOTFS_DIR}/etc/systemd/system/getty@tty1.service.d install -m 644 files/noclear.conf ${ROOTFS_DIR}/etc/systemd/system/getty@tty1.service.d/noclear.conf -install -m 744 files/policy-rc.d ${ROOTFS_DIR}/usr/sbin/policy-rc.d #TODO: Necessary in systemd? install -v -m 644 files/fstab ${ROOTFS_DIR}/etc/fstab on_chroot << EOF diff --git a/stage1/01-sys-tweaks/files/policy-rc.d b/stage1/01-sys-tweaks/files/policy-rc.d deleted file mode 100755 index 1924710..0000000 --- a/stage1/01-sys-tweaks/files/policy-rc.d +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh - -exit 101 diff --git a/stage2/01-sys-tweaks/01-run.sh b/stage2/01-sys-tweaks/01-run.sh index b735f58..9eb7629 100755 --- a/stage2/01-sys-tweaks/01-run.sh +++ b/stage2/01-sys-tweaks/01-run.sh @@ -22,14 +22,6 @@ EOF if [ "${USE_QEMU}" = "1" ]; then echo "enter QEMU mode" install -m 644 files/90-qemu.rules ${ROOTFS_DIR}/etc/udev/rules.d/ - if [ -e ${ROOTFS_DIR}/etc/ld.so.preload.disabled ]; then - rm ${ROOTFS_DIR}/etc/ld.so.preload.disabled - touch ${ROOTFS_DIR}/etc/ld.so.preload.disabled - fi - if [ -e ${ROOTFS_DIR}/etc/ld.so.preload ]; then - rm ${ROOTFS_DIR}/etc/ld.so.preload - touch ${ROOTFS_DIR}/etc/ld.so.preload - fi on_chroot << EOF systemctl disable resize2fs_once EOF