From 6e18b20a20cb04098bdf0e820361378048db840d Mon Sep 17 00:00:00 2001
From: Colin Walters <walters@verbum.org>
Date: Wed, 6 Dec 2023 10:58:56 -0500
Subject: [PATCH] bootupd: Use --write-uuid

This is an even newer behavior that takes over handling
of the "UUID stamp files", which we want in general instead of
using the static labels.

Note `--write-uuid` implies `--with-static-configs`.

This should fix this use case:

```
clearpart --all --initlabel --disklabel=gpt
reqpart --add-boot
part / --grow --fstype xfs
```

Whereas right now we require:

```
clearpart --all --initlabel --disklabel=gpt
reqpart
part /boot --size=1000  --fstype=ext4 --label=boot
part / --grow --fstype xfs
```

Specifically the `--label=boot`.

(cherry picked from commit 7b091defdda1dccb229a62188739d23b815a6b3f)

Related: RHEL-2250
---
 pyanaconda/modules/payloads/payload/rpm_ostree/installation.py  | 2 +-
 .../modules/payloads/payload/test_rpm_ostree_tasks.py           | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/pyanaconda/modules/payloads/payload/rpm_ostree/installation.py b/pyanaconda/modules/payloads/payload/rpm_ostree/installation.py
index 92eb614f3d8..e5e2cbd671f 100644
--- a/pyanaconda/modules/payloads/payload/rpm_ostree/installation.py
+++ b/pyanaconda/modules/payloads/payload/rpm_ostree/installation.py
@@ -437,7 +437,7 @@ def _install_bootupd(self):
                 "backend",
                 "install",
                 "--auto",
-                "--with-static-configs",
+                "--write-uuid",
                 "--device",
                 dev_data.path,
                 "/",
diff --git a/tests/unit_tests/pyanaconda_tests/modules/payloads/payload/test_rpm_ostree_tasks.py b/tests/unit_tests/pyanaconda_tests/modules/payloads/payload/test_rpm_ostree_tasks.py
index 1f3491d6d0b..406e5c51b96 100644
--- a/tests/unit_tests/pyanaconda_tests/modules/payloads/payload/test_rpm_ostree_tasks.py
+++ b/tests/unit_tests/pyanaconda_tests/modules/payloads/payload/test_rpm_ostree_tasks.py
@@ -694,7 +694,7 @@ def test_bootupd_run(self, devdata_mock, storage_mock, symlink_mock, rename_mock
             exec_mock.assert_has_calls([
                 call(
                     "bootupctl",
-                    ["backend", "install", "--auto", "--with-static-configs", "--device",
+                    ["backend", "install", "--auto", "--write-uuid", "--device",
                      "/dev/btldr-drv", "/"],
                     root=sysroot
                 ),