systemd: Add handler ensuring machine-id always exists

Signed-off-by: Ikey Doherty <[email protected]>

s/systemd/manifest.x86_64.jsonc

@@ -1154,6 +1154,7 @@
 				"/usr/share/man/man8/telinit.8",
 				"/usr/share/man/man8/udevadm.8",
 				"/usr/share/moss/triggers/sys.d/systemd_etcfiles.yaml",
+				"/usr/share/moss/triggers/sys.d/systemd_machine_id.yaml",
 				"/usr/share/moss/triggers/sys.d/systemd_presets.yaml",
 				"/usr/share/moss/triggers/sys.d/systemd_sysusers.yaml",
 				"/usr/share/moss/triggers/sys.d/systemd_tmpfiles.yaml",
@@ -1248,18 +1249,18 @@
 				"binary(timedatectl)",
 				"binary(udevadm)",
 				"binary(userdbctl)",
-				"soname(libcryptsetup-token-systemd-pkcs11.so(x86_64))",
-				"soname(libcryptsetup-token-systemd-tpm2.so(x86_64))",
+				"soname(cryptsetup/libcryptsetup-token-systemd-pkcs11.so(x86_64))",
+				"soname(cryptsetup/libcryptsetup-token-systemd-tpm2.so(x86_64))",
 				"soname(libnss_myhostname.so.2(x86_64))",
 				"soname(libnss_mymachines.so.2(x86_64))",
 				"soname(libnss_resolve.so.2(x86_64))",
 				"soname(libnss_systemd.so.2(x86_64))",
-				"soname(libsystemd-core-254.so(x86_64))",
-				"soname(libsystemd-shared-254.so(x86_64))",
 				"soname(libsystemd.so.0(x86_64))",
 				"soname(libudev.so.1(x86_64))",
-				"soname(pam_systemd.so(x86_64))",
-				"soname(pam_systemd_home.so(x86_64))",
+				"soname(security/pam_systemd.so(x86_64))",
+				"soname(security/pam_systemd_home.so(x86_64))",
+				"soname(systemd/libsystemd-core-254.so(x86_64))",
+				"soname(systemd/libsystemd-shared-254.so(x86_64))",
 				"sysbinary(halt)",
 				"sysbinary(init)",
 				"sysbinary(mount.ddi)",
@@ -2172,7 +2173,7 @@
 				"interpreter(/usr/lib/ld-linux-x86-64.so.2(x86_64))",
 				"soname(ld-linux-x86-64.so.2(x86_64))",
 				"soname(libc.so.6(x86_64))",
-				"soname(libsystemd-shared-254.so(x86_64))"
+				"soname(systemd/libsystemd-shared-254.so(x86_64))"
 			],
 			"files": [
 				"/usr/bin/networkctl",
@@ -2221,6 +2222,6 @@
 		}
 	},
 	"source-name": "systemd",
-	"source-release": "41",
+	"source-release": "42",
 	"source-version": "254.18"
 }

s/systemd/pkg/systemd_machine_id.yaml

@@ -0,0 +1,14 @@
+name: systemd_machine_id
+description: |
+    Run systemd-tmpfiles
+before: systemd_etcfiles
+
+handlers:
+    systemd_machine_id:
+        run: /usr/bin/systemd-machine-id-setup
+        args: []
+
+paths:
+    "/usr/bin/systemd-machine-id-setup":
+        handlers:
+            - systemd_machine_id

s/systemd/stone.yaml

@@ -5,7 +5,7 @@
 #
 name        : systemd
 version     : 254.18
-release     : 41
+release     : 42
 summary     : A System and Service Manager
 license     :
     - GPL-2.0-or-later
@@ -163,6 +163,7 @@ install     : |
     %install_file %(pkgdir)/systemd_tmpfiles.yaml %(installroot)/usr/share/moss/triggers/sys.d/systemd_tmpfiles.yaml
     %install_file %(pkgdir)/systemd_sysusers.yaml %(installroot)/usr/share/moss/triggers/sys.d/systemd_sysusers.yaml
     %install_file %(pkgdir)/systemd_presets.yaml %(installroot)/usr/share/moss/triggers/sys.d/systemd_presets.yaml
+    %install_file %(pkgdir)/systemd_machine_id.yaml %(installroot)/usr/share/moss/triggers/sys.d/systemd_machine_id.yaml
 
     # And transaction triggers
     %install_file %(pkgdir)/systemd_hwdb.yaml %(installroot)/usr/share/moss/triggers/tx.d/systemd_hwdb.yaml