Browse Source

Remove ld.so.preload and policy-rc.d changes

pull/120/merge
Serge Schneider 4 years ago
parent
commit
c430f618d0
6 changed files with 0 additions and 29 deletions
  1. +0
    -8
      export-image/00-allow-rerun/00-run.sh
  2. +0
    -3
      export-image/00-allow-rerun/files/policy-rc.d
  3. +0
    -6
      export-image/04-finalise/01-run.sh
  4. +0
    -1
      stage1/01-sys-tweaks/00-run.sh
  5. +0
    -3
      stage1/01-sys-tweaks/files/policy-rc.d
  6. +0
    -8
      stage2/01-sys-tweaks/01-run.sh

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

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

+ 0
- 3
export-image/00-allow-rerun/files/policy-rc.d View File

@ -1,3 +0,0 @@
#!/bin/sh
exit 101

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

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

+ 0
- 1
stage1/01-sys-tweaks/00-run.sh View File

@ -2,7 +2,6 @@
install -d ${ROOTFS_DIR}/etc/systemd/system/[email protected]
install -m 644 files/noclear.conf ${ROOTFS_DIR}/etc/systemd/system/[email protected]/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

+ 0
- 3
stage1/01-sys-tweaks/files/policy-rc.d View File

@ -1,3 +0,0 @@
#!/bin/sh
exit 101

+ 0
- 8
stage2/01-sys-tweaks/01-run.sh View File

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

Loading…
Cancel
Save