From e754f3a5eb3c9e719f87544de45b5200eb1bf61a Mon Sep 17 00:00:00 2001 From: Tommy Date: Tue, 27 Feb 2024 00:19:46 -0700 Subject: [PATCH] ld.preload path does not needed to be hardcoded Signed-off-by: Tommy --- x86-v3-QEMU-Docker.ign => x86-QEMU-Docker.ign | 2 +- x86-v3-QEMU-Docker.yml => x86-QEMU-Docker.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) rename x86-v3-QEMU-Docker.ign => x86-QEMU-Docker.ign (97%) rename x86-v3-QEMU-Docker.yml => x86-QEMU-Docker.yml (99%) diff --git a/x86-v3-QEMU-Docker.ign b/x86-QEMU-Docker.ign similarity index 97% rename from x86-v3-QEMU-Docker.ign rename to x86-QEMU-Docker.ign index 2f69fb6..76ec434 100644 --- a/x86-v3-QEMU-Docker.ign +++ b/x86-QEMU-Docker.ign @@ -236,7 +236,7 @@ "name": "postinst.service" }, { - "contents": "[Unit]\nDescription=Initial System Setup Part 2\n# We run this after the packages have been overlayed\nAfter=network-online.target\nConditionPathExists=!/var/lib/%N.stamp\nConditionPathExists=/var/lib/postinst.stamp\n\n[Service]\nType=oneshot\nRemainAfterExit=yes\nExecStart=/usr/bin/echo \"/lib64/glibc-hwcaps/x86-64-v3/libhardened_malloc.so\" | tee /etc/ld.so.preload\nExecStart=/usr/bin/systemctl enable --now firewalld\nExecStart=/usr/bin/firewall-cmd --lockdown-on\nExecStart=/usr/bin/systemctl --no-block reboot\n\n[Install]\nWantedBy=multi-user.target\n", + "contents": "[Unit]\nDescription=Initial System Setup Part 2\n# We run this after the packages have been overlayed\nAfter=network-online.target\nConditionPathExists=!/var/lib/%N.stamp\nConditionPathExists=/var/lib/postinst.stamp\n\n[Service]\nType=oneshot\nRemainAfterExit=yes\nExecStart=/usr/bin/echo \"libhardened_malloc.so\" | tee /etc/ld.so.preload\nExecStart=/usr/bin/systemctl enable --now firewalld\nExecStart=/usr/bin/firewall-cmd --lockdown-on\nExecStart=/usr/bin/systemctl --no-block reboot\n\n[Install]\nWantedBy=multi-user.target\n", "enabled": true, "name": "postinst2.service" }, diff --git a/x86-v3-QEMU-Docker.yml b/x86-QEMU-Docker.yml similarity index 99% rename from x86-v3-QEMU-Docker.yml rename to x86-QEMU-Docker.yml index bf7a86a..98e08cf 100644 --- a/x86-v3-QEMU-Docker.yml +++ b/x86-QEMU-Docker.yml @@ -69,7 +69,7 @@ systemd: [Service] Type=oneshot RemainAfterExit=yes - ExecStart=/usr/bin/echo "/lib64/glibc-hwcaps/x86-64-v3/libhardened_malloc.so" | tee /etc/ld.so.preload + ExecStart=/usr/bin/echo "libhardened_malloc.so" | tee /etc/ld.so.preload ExecStart=/usr/bin/systemctl enable --now firewalld ExecStart=/usr/bin/firewall-cmd --lockdown-on ExecStart=/usr/bin/systemctl --no-block reboot