update

3 files changed, 11 insertions, 11 deletions

diff --git a/.SRCINFO b/.SRCINFO
index a8f5a9b4299c..8fb90468704d 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = systemd-fml
 	pkgver = 255.4
-	pkgrel = 3
+	pkgrel = 4
 	url = https://www.github.com/systemd/systemd
 	arch = x86_64
 	license = LGPL-2.1-or-later
@@ -54,7 +54,7 @@ pkgbase = systemd-fml
 	conflicts = mkinitcpio<38-1
 	source = systemd-fml-stable::git+https://github.com/systemd/systemd-stable#tag=v255.4
 	source = 0001-Use-Arch-Linux-device-access-groups.patch
-	source = 0002_added_machine_id_smbios_variable.patch
+	source = 0002_added_machine_id_firmware_option.patch
 	source = arch.conf
 	source = loader.conf
 	source = splash-arch.bmp
@@ -76,7 +76,7 @@ pkgbase = systemd-fml
 	validpgpkeys = 5C251B5FC54EB2F80F407AAAC54CA336CFEB557E
 	sha512sums = 0c41c21931c5f08b5c91fe718d90f8cb11fb83429b3028bde9922605a35ea81d8452b00af99775b519b19195b8ba0084147d13dec1c5dfe9c905d769018b0676
 	sha512sums = 3ccf783c28f7a1c857120abac4002ca91ae1f92205dcd5a84aff515d57e706a3f9240d75a0a67cff5085716885e06e62597baa86897f298662ec36a940cf410e
-	sha512sums = 335e6d0b43c898655127fc4032a235b7add7c917c52a8973ab5eee0d02685aba648f428c167ff6319b8af76ae63a9c1b7fa92f0cae835d6409ccc0421ef8718b
+	sha512sums = b5ed67bc584e908712bae5cc7c073af1879b4f037806eb996c5c77e9d36c36941cc0c24d5644efcb98048d7b3339482bb5067a7254932b05e614a162dec4bc96
 	sha512sums = 61032d29241b74a0f28446f8cf1be0e8ec46d0847a61dadb2a4f096e8686d5f57fe5c72bcf386003f6520bc4b5856c32d63bf3efe7eb0bc0deefc9f68159e648
 	sha512sums = c416e2121df83067376bcaacb58c05b01990f4614ad9de657d74b6da3efa441af251d13bf21e3f0f71ddcb4c9ea658b81da3d915667dc5c309c87ec32a1cb5a5
 	sha512sums = 5a1d78b5170da5abe3d18fdf9f2c3a4d78f15ba7d1ee9ec2708c4c9c2e28973469bc19386f70b3cf32ffafbe4fcc4303e5ebbd6d5187a1df3314ae0965b25e75
diff --git a/0002_added_machine_id_smbios_variable.patch b/0002_added_machine_id_firmware_option.patch
index 633583c6c92b..445fb3f6d212 100644
--- a/0002_added_machine_id_smbios_variable.patch
+++ b/0002_added_machine_id_firmware_option.patch
@@ -7,7 +7,7 @@ Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
 ===================================================================
 diff --git a/man/machine-id.xml b/man/machine-id.xml
 --- a/man/machine-id.xml	(revision 99a1ef8c9cdcb0fc15265533dae2bbd8f2d7a3a5)
-+++ b/man/machine-id.xml	(revision 3a01c4414175e630e1c2e62fa8cc89dfc61d55ee)
++++ b/man/machine-id.xml	(revision fe3fa3d6a2a02f665ebca19088873165e24ad0db)
 @@ -102,7 +102,7 @@
      value of the kernel command line option <varname>container_uuid</varname>, the KVM DMI
      <filename>product_uuid</filename> or the devicetree <filename>vm,uuid</filename>
@@ -24,7 +24,7 @@ Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
 ===================================================================
 diff --git a/src/core/main.c b/src/core/main.c
 --- a/src/core/main.c	(revision 99a1ef8c9cdcb0fc15265533dae2bbd8f2d7a3a5)
-+++ b/src/core/main.c	(revision 3a01c4414175e630e1c2e62fa8cc89dfc61d55ee)
++++ b/src/core/main.c	(revision fe3fa3d6a2a02f665ebca19088873165e24ad0db)
 @@ -354,10 +354,11 @@
                  if (proc_cmdline_value_missing(key, value))
                          return 0;
@@ -48,7 +48,7 @@ Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
 ===================================================================
 diff --git a/src/shared/machine-id-setup.c b/src/shared/machine-id-setup.c
 --- a/src/shared/machine-id-setup.c	(revision 99a1ef8c9cdcb0fc15265533dae2bbd8f2d7a3a5)
-+++ b/src/shared/machine-id-setup.c	(revision 3a01c4414175e630e1c2e62fa8cc89dfc61d55ee)
++++ b/src/shared/machine-id-setup.c	(revision fe3fa3d6a2a02f665ebca19088873165e24ad0db)
 @@ -1,6 +1,7 @@
  /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
@@ -65,9 +65,9 @@ diff --git a/src/shared/machine-id-setup.c b/src/shared/machine-id-setup.c
 +        _cleanup_free_ char *buf = NULL;
 +        int r;
 +
-+        r = proc_cmdline_get_key("systemd.machine_id_smbios", PROC_CMDLINE_VALUE_OPTIONAL, &buf);
++        r = proc_cmdline_get_key("systemd.machine_id", PROC_CMDLINE_VALUE_OPTIONAL, &buf);
 +        if (r < 0) {
-+                log_warning_errno(r, "Failed to read systemd.machine_id_smbios from kernel command line, ignoring: %m");
++                log_warning_errno(r, "Failed to read systemd.machine_id from kernel command line, ignoring: %m");
 +                return false;
 +        }
 +
diff --git a/PKGBUILD b/PKGBUILD
index 5663489e61c7..b1e7c8483aa2 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -15,7 +15,7 @@ _tag='255.4'
 # ➜ vercmp 255rc1 255
 # -1
 pkgver="${_tag/~/}"
-pkgrel=3
+pkgrel=4
 arch=('x86_64')
 license=('LGPL-2.1-or-later')
 url='https://www.github.com/systemd/systemd'
@@ -35,7 +35,7 @@ validpgpkeys=('63CDA1E5D3FC22B998D20DD6327F26951A015CC4'  # Lennart Poettering <
 source=("$pkgbase-stable::git+https://github.com/systemd/systemd-stable#tag=v${_tag}"
 #        "$pkgbase::git+https://github.com/systemd/systemd#tag=v${_tag%.*}?signed"
         '0001-Use-Arch-Linux-device-access-groups.patch'
-        '0002_added_machine_id_smbios_variable.patch'
+        '0002_added_machine_id_firmware_option.patch'
         # bootloader files
         'arch.conf'
         'loader.conf'
@@ -57,7 +57,7 @@ source=("$pkgbase-stable::git+https://github.com/systemd/systemd-stable#tag=v${_
 
 sha512sums=('0c41c21931c5f08b5c91fe718d90f8cb11fb83429b3028bde9922605a35ea81d8452b00af99775b519b19195b8ba0084147d13dec1c5dfe9c905d769018b0676'
             '3ccf783c28f7a1c857120abac4002ca91ae1f92205dcd5a84aff515d57e706a3f9240d75a0a67cff5085716885e06e62597baa86897f298662ec36a940cf410e'
-            '335e6d0b43c898655127fc4032a235b7add7c917c52a8973ab5eee0d02685aba648f428c167ff6319b8af76ae63a9c1b7fa92f0cae835d6409ccc0421ef8718b'
+            'b5ed67bc584e908712bae5cc7c073af1879b4f037806eb996c5c77e9d36c36941cc0c24d5644efcb98048d7b3339482bb5067a7254932b05e614a162dec4bc96'
             '61032d29241b74a0f28446f8cf1be0e8ec46d0847a61dadb2a4f096e8686d5f57fe5c72bcf386003f6520bc4b5856c32d63bf3efe7eb0bc0deefc9f68159e648'
             'c416e2121df83067376bcaacb58c05b01990f4614ad9de657d74b6da3efa441af251d13bf21e3f0f71ddcb4c9ea658b81da3d915667dc5c309c87ec32a1cb5a5'
             '5a1d78b5170da5abe3d18fdf9f2c3a4d78f15ba7d1ee9ec2708c4c9c2e28973469bc19386f70b3cf32ffafbe4fcc4303e5ebbd6d5187a1df3314ae0965b25e75'