Fix /etc/ld.so.preload handling

Signed-off-by: Tommy <contact@tommytran.io>

x86.yml

@@ -36,6 +36,7 @@ systemd:
         After=systemd-machine-id-commit.service
         After=network-online.target
         Before=zincati.service
+        ConditionPathExists=!/var/lib/%N.stamp
 
         [Service]
         Type=oneshot
@@ -46,9 +47,27 @@ systemd:
         ExecStart=/usr/sbin/setsebool -P virt_use_samba off
         ExecStart=/usr/bin/rpm-ostree install hardened_malloc qemu-guest-agent tuned
         ExecStart=/usr/bin/sed -i 's/\s+nullok//g' /etc/pam.d/system-auth
+        ExecStart=/usr/bin/touch /var/lib/%N.stamp
+        ExecStart=/usr/bin/systemctl --no-block reboot
+
+        [Install]
+        WantedBy=multi-user.target
+
+    - name: postinst2.service
+      enabled: true
+      contents: |
+        [Unit]
+        ConditionPathExists=/var/lib/postinst.stamp
+
+        [Service]
+        Type=oneshot
+        RemainAfterExit=yes
+        ExecStart=/usr/bin/echo 'libhardened_malloc.so' > /etc/ld.so.preload
         ExecStart=/usr/bin/systemctl disable postinst
         ExecStart=/usr/bin/rm /etc/systemd/system/postinst.service
-        ExecStart=/usr/bin/echo 'libhardened_malloc.so' > /etc/ld.so.preload
+        ExecStart=/usr/bin/rm /var/lib/postinst.stamp
+        ExecStart=/usr/bin/systemctl disable postinst2
+        ExecStart=/usr/bin/rm /etc/systemd/system/postinst2.service
         ExecStart=/usr/bin/systemctl --no-block reboot
 
         [Install]