From 674c940aa8b1986bd4761cdb63b8b939a4f7ee41 Mon Sep 17 00:00:00 2001
From: Daniel McIlvaney <damcilva@microsoft.com>
Date: Mon, 1 Nov 2021 12:55:15 -0700
Subject: [PATCH] =?UTF-8?q?[dev]=20cherry-pick=20verity-read-only-root:=20?=
 =?UTF-8?q?Add=20missing=20whitespace=20in=20verity.conf=20mo=E2=80=A6=20(?=
 =?UTF-8?q?#1592)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* [1.0] verity-read-only-root: Add missing whitespace in verity.conf module lists (#1527)

* Add missing whitespace in verity.conf module lists

* Add license verification entry
---
 .../verity-read-only-root.signatures.json                 | 2 +-
 SPECS/verity-read-only-root/verity-read-only-root.spec    | 8 ++++++--
 SPECS/verity-read-only-root/verity.conf                   | 4 ++--
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/SPECS/verity-read-only-root/verity-read-only-root.signatures.json b/SPECS/verity-read-only-root/verity-read-only-root.signatures.json
index 52464caa89..8adb0277d0 100644
--- a/SPECS/verity-read-only-root/verity-read-only-root.signatures.json
+++ b/SPECS/verity-read-only-root/verity-read-only-root.signatures.json
@@ -5,6 +5,6 @@
   "module-setup.sh": "c3093b6664963b5588b90508021ff5f6190f64acaec1f010720e1aad6df14929",
   "verity-mount.sh": "bb1dca3ee3f72974d237856393b67e69f8713615548730ea851a7edfc575bf71",
   "verity-parse.sh": "b9c9989503826ac2b4d2360493d3b624e1ea573b49303dfab0e79c181887f333",
-  "verity.conf": "3633d464309a7e4de7cd3d672e6ed0970c2350f85349686baea16c6827aee864"
+  "verity.conf": "f1cbec8e6eabc545a67ac60232f625830432e47a44f903422fcaeb1f6e65e353"
  }
 }
\ No newline at end of file
diff --git a/SPECS/verity-read-only-root/verity-read-only-root.spec b/SPECS/verity-read-only-root/verity-read-only-root.spec
index 7535706e50..016a6dcea7 100644
--- a/SPECS/verity-read-only-root/verity-read-only-root.spec
+++ b/SPECS/verity-read-only-root/verity-read-only-root.spec
@@ -1,7 +1,7 @@
 Summary:        Dracut module to enable dm-verity read-only roots
 Name:           verity-read-only-root
 Version:        1.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 License:        GPLv2+
 Vendor:         Microsoft Corporation
 Distribution:   Mariner
@@ -73,5 +73,9 @@ install -p -m 0755  %{SOURCE5} %{buildroot}/mnt/create_linear_mount.sh
 /mnt/create_linear_mount.sh
 
 %changelog
+* Wed Oct 13 2021 Daniel McIlvaney <damcilva@microsoft.com> - 1.0-2
+- Add required whitespace before and after module list in verity.conf
+- License verified.
+
 * Fri Dec 11 2020 Daniel McIlvaney <damcilva@microsoft.com> - 1.0-1
-- Original version for CBL-Mariner.
\ No newline at end of file
+- Original version for CBL-Mariner.
diff --git a/SPECS/verity-read-only-root/verity.conf b/SPECS/verity-read-only-root/verity.conf
index 51670abf15..3cae0aac24 100644
--- a/SPECS/verity-read-only-root/verity.conf
+++ b/SPECS/verity-read-only-root/verity.conf
@@ -1,2 +1,2 @@
-add_dracutmodules+="dm verity-mount"
-add_drivers+="dm-verity vfat overlay"
+add_dracutmodules+=" dm verity-mount "
+add_drivers+=" dm-verity vfat overlay "