ostree: Subsume ostree-prepare.sh into the recipe itself

The previous machine-id rework already moved one bit of ostree-prepare.sh
out of it, let's directly embed the two remaining commands in the
recipe directly for simplicity.

Signed-off-by: Emanuele Aina <emanuele.aina@collabora.com>

apertis-ostree-commit.yaml

@@ -71,8 +71,14 @@ actions:
     script: scripts/mildenhall-extensions-theme.sh
 
   - action: run
+    description: "Prevent /home and /srv from being created incorrectly from tmpfiles.d"
     chroot: true
-    script: scripts/ostree-prepare.sh
+    command: rm -f /usr/lib/tmpfiles.d/home.conf
+
+  - action: run
+    description: "Drop legacy D-Bus tmpfiles.d snippet"
+    chroot: true
+    command: rm -f /usr/lib/tmpfiles.d/dbus.conf
 
   # can't be done before due to https://github.com/systemd/systemd/issues/11925
   - action: run

scripts/ostree-prepare.sh

-#!/bin/sh
-
-set -e
-
-# Creates /home and /srv in ways incorrect for ostree
-rm -f /usr/lib/tmpfiles.d/home.conf
-
-# tries to create unneeded legacy file
-rm -f /usr/lib/tmpfiles.d/dbus.conf