From dcbfc7872e96c20b4d29b527d3467f547f6971d0 Mon Sep 17 00:00:00 2001
From: Antonio Alvarez Feijoo <antonio.feijoo@suse.com>
Date: Thu, 24 Oct 2024 09:54:48 +0200
Subject: [PATCH 1/3] man: fix links to veritysetup(8)

---
 man/systemd-veritysetup-generator.xml | 4 ++--
 man/systemd-veritysetup@.service.xml  | 2 +-
 man/veritytab.xml                     | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/man/systemd-veritysetup-generator.xml b/man/systemd-veritysetup-generator.xml
index f583468229..f8a44c9cc0 100644
--- a/man/systemd-veritysetup-generator.xml
+++ b/man/systemd-veritysetup-generator.xml
@@ -104,7 +104,7 @@
         <option>hash=<replaceable>HASH</replaceable></option>, <option>fec-device=<replaceable>PATH</replaceable></option>,
         <option>fec-offset=<replaceable>BYTES</replaceable></option>, <option>fec-roots=<replaceable>NUM</replaceable></option> and
         <option>root-hash-signature=<replaceable>PATH</replaceable>|base64:<replaceable>HEX</replaceable></option>. See
-        <citerefentry project='die-net'><refentrytitle>veritysetup</refentrytitle><manvolnum>8</manvolnum></citerefentry> for more
+        <citerefentry project='man-pages'><refentrytitle>veritysetup</refentrytitle><manvolnum>8</manvolnum></citerefentry> for more
         details.</para>
 
         <xi:include href="version-info.xml" xpointer="v248"/></listitem>
@@ -129,7 +129,7 @@
     <para><simplelist type="inline">
       <member><citerefentry><refentrytitle>systemd</refentrytitle><manvolnum>1</manvolnum></citerefentry></member>
       <member><citerefentry><refentrytitle>systemd-veritysetup@.service</refentrytitle><manvolnum>8</manvolnum></citerefentry></member>
-      <member><citerefentry project='die-net'><refentrytitle>veritysetup</refentrytitle><manvolnum>8</manvolnum></citerefentry></member>
+      <member><citerefentry project='man-pages'><refentrytitle>veritysetup</refentrytitle><manvolnum>8</manvolnum></citerefentry></member>
       <member><citerefentry><refentrytitle>systemd-fstab-generator</refentrytitle><manvolnum>8</manvolnum></citerefentry></member>
     </simplelist></para>
   </refsect1>
diff --git a/man/systemd-veritysetup@.service.xml b/man/systemd-veritysetup@.service.xml
index c715dac422..a976a062de 100644
--- a/man/systemd-veritysetup@.service.xml
+++ b/man/systemd-veritysetup@.service.xml
@@ -97,7 +97,7 @@
     <para><simplelist type="inline">
       <member><citerefentry><refentrytitle>systemd</refentrytitle><manvolnum>1</manvolnum></citerefentry></member>
       <member><citerefentry><refentrytitle>systemd-veritysetup-generator</refentrytitle><manvolnum>8</manvolnum></citerefentry></member>
-      <member><citerefentry project='die-net'><refentrytitle>veritysetup</refentrytitle><manvolnum>8</manvolnum></citerefentry></member>
+      <member><citerefentry project='man-pages'><refentrytitle>veritysetup</refentrytitle><manvolnum>8</manvolnum></citerefentry></member>
      </simplelist></para>
   </refsect1>
 
diff --git a/man/veritytab.xml b/man/veritytab.xml
index 6bd09604b6..19b26e9b37 100644
--- a/man/veritytab.xml
+++ b/man/veritytab.xml
@@ -319,7 +319,7 @@ data /etc/data /etc/hash a5ee4b42f70ae1f46a08a7c92c2e0a20672ad2f514792730f5d49d7
       <member><citerefentry><refentrytitle>systemd-veritysetup@.service</refentrytitle><manvolnum>8</manvolnum></citerefentry></member>
       <member><citerefentry><refentrytitle>systemd-veritysetup-generator</refentrytitle><manvolnum>8</manvolnum></citerefentry></member>
       <member><citerefentry project='man-pages'><refentrytitle>fstab</refentrytitle><manvolnum>5</manvolnum></citerefentry></member>
-      <member><citerefentry project='die-net'><refentrytitle>veritysetup</refentrytitle><manvolnum>8</manvolnum></citerefentry></member>
+      <member><citerefentry project='man-pages'><refentrytitle>veritysetup</refentrytitle><manvolnum>8</manvolnum></citerefentry></member>
     </simplelist></para>
   </refsect1>
 

From e98e3f856d56bfb8dd8883f9e570bb56c4b1e3b2 Mon Sep 17 00:00:00 2001
From: Antonio Alvarez Feijoo <antonio.feijoo@suse.com>
Date: Thu, 24 Oct 2024 10:07:28 +0200
Subject: [PATCH 2/3] man/veritysetup-generator: document veritytab kernel
 command line option

---
 man/systemd-veritysetup-generator.xml | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/man/systemd-veritysetup-generator.xml b/man/systemd-veritysetup-generator.xml
index f8a44c9cc0..ca133eb506 100644
--- a/man/systemd-veritysetup-generator.xml
+++ b/man/systemd-veritysetup-generator.xml
@@ -54,12 +54,24 @@
 
         <listitem><para>Takes a boolean argument. Defaults to <literal>yes</literal>. If
         <literal>no</literal>, disables the generator entirely. <varname>rd.systemd.verity=</varname> is
-        honored only by the initrd while <varname>systemd.verity=</varname> is honored by both the host
-        system and the initrd.</para>
+        honored only in the initrd while <varname>systemd.verity=</varname> is honored by both the main
+        system and in the initrd.</para>
 
         <xi:include href="version-info.xml" xpointer="v233"/></listitem>
       </varlistentry>
 
+      <varlistentry>
+        <term><varname>veritytab=</varname></term>
+        <term><varname>rd.veritytab=</varname></term>
+
+        <listitem><para>Takes a boolean argument. Defaults to <literal>yes</literal>. If
+        <literal>no</literal>, causes the generator to ignore any devices configured in
+        <filename>/etc/veritytab</filename>. <varname>rd.veritytab=</varname> is honored only in the initrd
+        while <varname>veritytab=</varname> is honored by both the main system and in the initrd.</para>
+
+        <xi:include href="version-info.xml" xpointer="v248"/></listitem>
+      </varlistentry>
+
       <varlistentry>
         <term><varname>roothash=</varname></term>
 

From 11de19f3da18cf658d7efadbecc6691e13503a00 Mon Sep 17 00:00:00 2001
From: Antonio Alvarez Feijoo <antonio.feijoo@suse.com>
Date: Thu, 24 Oct 2024 10:07:45 +0200
Subject: [PATCH 3/3] veritysetup-generator: remove unused code

---
 src/veritysetup/veritysetup-generator.c | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/src/veritysetup/veritysetup-generator.c b/src/veritysetup/veritysetup-generator.c
index 95ce82b7c6..8e35946ca6 100644
--- a/src/veritysetup/veritysetup-generator.c
+++ b/src/veritysetup/veritysetup-generator.c
@@ -453,7 +453,6 @@ static int add_veritytab_devices(void) {
         for (;;) {
                 _cleanup_free_ char *line = NULL, *name = NULL, *data_device = NULL, *hash_device = NULL,
                                     *roothash = NULL, *options = NULL;
-                char *data_uuid, *hash_uuid;
 
                 r = read_stripped_line(f, LONG_LINE_MAX, &line);
                 if (r < 0)
@@ -472,14 +471,6 @@ static int add_veritytab_devices(void) {
                         continue;
                 }
 
-                data_uuid = startswith(data_device, "UUID=");
-                if (!data_uuid)
-                        data_uuid = path_startswith(data_device, "/dev/disk/by-uuid/");
-
-                hash_uuid = startswith(hash_device, "UUID=");
-                if (!hash_uuid)
-                        hash_uuid = path_startswith(hash_device, "/dev/disk/by-uuid/");
-
                 r = create_veritytab_device(
                                 name,
                                 data_device,