From d9fe4221b071cea68f5c6d619845a9525b0854f0 Mon Sep 17 00:00:00 2001
From: Dusty Mabe <dusty@dustymabe.com>
Date: Wed, 10 Jan 2024 17:28:10 -0500
Subject: [PATCH] manifests: move boot/root fs uuid/label to var in fcos
 manifest

This makes it easier to see the important unique values in our
manifest.
---
 .../fedora-coreos-container.mpp.yaml          | 31 ++++++++++++++-----
 1 file changed, 23 insertions(+), 8 deletions(-)

diff --git a/test/data/manifests/fedora-coreos-container.mpp.yaml b/test/data/manifests/fedora-coreos-container.mpp.yaml
index 1deda8d4..771e2e79 100644
--- a/test/data/manifests/fedora-coreos-container.mpp.yaml
+++ b/test/data/manifests/fedora-coreos-container.mpp.yaml
@@ -7,6 +7,13 @@ mpp-vars:
   root_size_mb: 2048
   sector_size: 512
   four_k_sector_size: 4096
+  # Filesystem UUID and label definitions. These UUIDs
+  # are looked for on boot and if found replaced with
+  # a new random UUID to make each install unique.
+  boot_fs_uuid: 96d15588-3596-4b3c-adca-a2ff7279ea63
+  boot_fs_label: boot
+  root_fs_uuid: 910678ff-f77e-4a7d-8d53-86f2ac47a823
+  root_fs_label: root
 mpp-define-images:
   - id: image
     size:
@@ -159,8 +166,10 @@ pipelines:
                 mpp-format-int: '{image.layout[''boot''].size}'
               lock: true
         options:
-          uuid: 96d15588-3596-4b3c-adca-a2ff7279ea63
-          label: boot
+          uuid:
+            mpp-format-string: '{boot_fs_uuid}'
+          label:
+            mpp-format-string: '{boot_fs_label}'
       - type: org.osbuild.mkfs.xfs
         devices:
           device:
@@ -173,8 +182,10 @@ pipelines:
                 mpp-format-int: '{image.layout[''root''].size}'
               lock: true
         options:
-          uuid: 910678ff-f77e-4a7d-8d53-86f2ac47a823
-          label: root
+          uuid:
+            mpp-format-string: '{root_fs_uuid}'
+          label:
+            mpp-format-string: '{root_fs_label}'
       - type: org.osbuild.copy
         inputs:
           tree:
@@ -292,8 +303,10 @@ pipelines:
               sector-size:
                   mpp-format-int: "{four_k_sector_size}"
         options:
-          uuid: 96d15588-3596-4b3c-adca-a2ff7279ea63
-          label: boot
+          uuid:
+            mpp-format-string: '{boot_fs_uuid}'
+          label:
+            mpp-format-string: '{boot_fs_label}'
       - type: org.osbuild.mkfs.xfs
         devices:
           device:
@@ -308,8 +321,10 @@ pipelines:
               sector-size:
                   mpp-format-int: "{four_k_sector_size}"
         options:
-          uuid: 910678ff-f77e-4a7d-8d53-86f2ac47a823
-          label: root
+          uuid:
+            mpp-format-string: '{root_fs_uuid}'
+          label:
+            mpp-format-string: '{root_fs_label}'
       - type: org.osbuild.copy
         inputs:
           tree: