dm-verity: Remove usage of integrity

There is a difference between dm-verity and dm-integrity.  Remove
usage of integrity from verity documentation in man pages and
target files.

diff --git a/man/systemd-veritysetup-generator.xml b/man/systemd-veritysetup-generator.xml
index bf5e705f830e0c5b66c8a7ab0d52654ecddf0f40..3c9ee6788f0066f6d808e0642d5c5b9195aa2210 100644 (file)
--- a/man/systemd-veritysetup-generator.xml
+++ b/man/systemd-veritysetup-generator.xml
@@ -17,7 +17,7 @@
 
   <refnamediv>
     <refname>systemd-veritysetup-generator</refname>
-    <refpurpose>Unit generator for integrity protected block devices</refpurpose>
+    <refpurpose>Unit generator for verity protected block devices</refpurpose>
   </refnamediv>
 
   <refsynopsisdiv>
@@ -28,7 +28,7 @@
     <title>Description</title>
 
     <para><filename>systemd-veritysetup-generator</filename> is a generator that translates kernel command line options
-    configuring integrity-protected block devices (verity) into native systemd units early at boot and when
+    configuring verity protected block devices into native systemd units early at boot and when
     configuration of the system manager is reloaded. This will create
     <citerefentry><refentrytitle>systemd-veritysetup@.service</refentrytitle><manvolnum>8</manvolnum></citerefentry>
     units as necessary.</para>
@@ -66,7 +66,7 @@
         data devices to use are automatically derived from the specified hash value. Specifically, the data partition
         device is looked for under a GPT partition UUID derived from the first 128bit of the root hash, the hash
         partition device is looked for under a GPT partition UUID derived from the last 128bit of the root hash. Hence
-        it is usually sufficient to specify the root hash to boot from an integrity protected root file system, as
+        it is usually sufficient to specify the root hash to boot from a verity protected root file system, as
         device paths are automatically determined from it — as long as the partition table is properly set up.</para>
         </listitem>
       </varlistentry>
@@ -76,7 +76,7 @@
         <term><varname>systemd.verity_root_hash=</varname></term>
 
         <listitem><para>These two settings take block device paths as arguments and may be used to explicitly
-        configure the data partition and hash partition to use for setting up the integrity protection for the root file
+        configure the data partition and hash partition to use for setting up the verity protection for the root file
         system. If not specified, these paths are automatically derived from the <varname>roothash=</varname> argument
         (see above).</para></listitem>
       </varlistentry>

diff --git a/man/systemd-veritysetup@.service.xml b/man/systemd-veritysetup@.service.xml
index 70f08374e228a963297640ee6c1a04d8c88f7727..0f21c2fbbfd897524024ef76ce2be1f924cec4ec 100644 (file)
--- a/man/systemd-veritysetup@.service.xml
+++ b/man/systemd-veritysetup@.service.xml
@@ -18,7 +18,7 @@
   <refnamediv>
     <refname>systemd-veritysetup@.service</refname>
     <refname>systemd-veritysetup</refname>
-    <refpurpose>Disk integrity protection logic</refpurpose>
+    <refpurpose>Disk verity protection logic</refpurpose>
   </refnamediv>
 
   <refsynopsisdiv>
@@ -29,12 +29,12 @@
   <refsect1>
     <title>Description</title>
 
-    <para><filename>systemd-veritysetup@.service</filename> is a service responsible for setting up integrity
-    protection (verity) block devices. It should be instantiated for each device that requires integrity
+    <para><filename>systemd-veritysetup@.service</filename> is a service responsible for setting up verity
+    protection block devices. It should be instantiated for each device that requires verity
     protection.</para>
 
     <para>At early boot and when the system manager configuration is reloaded kernel command line configuration for
-    integrity protected block devices is translated into <filename>systemd-veritysetup@.service</filename> units by
+    verity protected block devices is translated into <filename>systemd-veritysetup@.service</filename> units by
     <citerefentry><refentrytitle>systemd-veritysetup-generator</refentrytitle><manvolnum>8</manvolnum></citerefentry>.</para>
 
     <para><filename>systemd-veritysetup@.service</filename> calls <command>systemd-veritysetup</command>.</para>

diff --git a/man/veritytab.xml b/man/veritytab.xml
index d29e9f5f2d0806cfba24b5c9e8c4e2ff3e532c89..28dce1fe38295d211abbbaa72ca5bb513511b4f3 100644 (file)
--- a/man/veritytab.xml
+++ b/man/veritytab.xml
@@ -33,12 +33,12 @@ This is based on crypttab(5).
     <title>Description</title>
 
     <para>The <filename>/etc/veritytab</filename> file describes
-    verity integrity protected block devices that are set up during
+    verity protected block devices that are set up during
     system boot.</para>
 
     <para>Empty lines and lines starting with the <literal>#</literal>
     character are ignored. Each of the remaining lines describes one
-    verity integrity protected block device. Fields are delimited by
+    verity protected block device. Fields are delimited by
     white space.</para>
 
     <para>Each line is in the form<programlisting><replaceable>volume-name</replaceable> <replaceable>data-device</replaceable> <replaceable>hash-device</replaceable> <replaceable>roothash</replaceable> <replaceable>options</replaceable></programlisting>
@@ -65,7 +65,7 @@ This is based on crypttab(5).
         <term><option>restart-on-corruption</option></term>
         <term><option>panic-on-corruption</option></term>
 
-        <listitem><para>Defines what to do if data integrity problem is detected (data corruption). Without these
+        <listitem><para>Defines what to do if a data verity problem is detected (data corruption). Without these
         options kernel fails the IO operation with I/O error. With <literal>--ignore-corruption</literal> option the
         corruption is only logged. With <literal>--restart-on-corruption</literal> or
         <literal>--panic-on-corruption</literal> the kernel is restarted (panicked) immediately.
@@ -149,18 +149,18 @@ This is based on crypttab(5).
       <varlistentry>
         <term><option>x-initrd.attach</option></term>
 
-        <listitem><para>Setup this verity integrity protected block device in the initramfs, similarly to
+        <listitem><para>Setup this verity protected block device in the initramfs, similarly to
         <citerefentry><refentrytitle>systemd.mount</refentrytitle><manvolnum>5</manvolnum></citerefentry>
         units marked with <option>x-initrd.mount</option>.</para>
 
         <para>Although it's not necessary to mark the mount entry for the root file system with
         <option>x-initrd.mount</option>, <option>x-initrd.attach</option> is still recommended with
-        the verity integrity protected block device containing the root file system as otherwise systemd
+        the verity protected block device containing the root file system as otherwise systemd
         will attempt to detach the device during the regular system shutdown while it's still in
         use. With this option the device will still be detached but later after the root file
         system is unmounted.</para>
 
-        <para>All other verity integrity protected block devices that contain file systems mounted in the
+        <para>All other verity protected block devices that contain file systems mounted in the
         initramfs should use this option.</para>
         </listitem>
       </varlistentry>
@@ -176,7 +176,7 @@ This is based on crypttab(5).
     <title>Examples</title>
     <example>
       <title>/etc/veritytab example</title>
-      <para>Set up two verity integrity protected block devices. One using device blocks, another using files.</para>
+      <para>Set up two verity protected block devices. One using device blocks, another using files.</para>
 
       <programlisting>usr  PARTUUID=783e45ae-7aa3-484a-beef-a80ff9c19cbb PARTUUID=21dc1dfe-4c33-8b48-98a9-918a22eb3e37 36e3f740ad502e2c25e2a23d9c7c17bf0fdad2300b7580842d4b7ec1fb0fa263 auto
 data /etc/data /etc/hash a5ee4b42f70ae1f46a08a7c92c2e0a20672ad2f514792730f5d49d7606ab8fdf auto

diff --git a/src/veritysetup/veritysetup-generator.c b/src/veritysetup/veritysetup-generator.c
index 1c68d283646412be33cb70cc654bb828f337fb18..13181b86ed82ee12c1eaddff68a0703fcfd64842 100644 (file)
--- a/src/veritysetup/veritysetup-generator.c
+++ b/src/veritysetup/veritysetup-generator.c
@@ -100,7 +100,7 @@ static int create_device(void) {
 
         fprintf(f,
                 "[Unit]\n"
-                "Description=Integrity Protection Setup for %%I\n"
+                "Description=Verity Protection Setup for %%I\n"
                 "Documentation=man:systemd-veritysetup-generator(8) man:systemd-veritysetup@.service(8)\n"
                 "SourcePath=/proc/cmdline\n"
                 "DefaultDependencies=no\n"

diff --git a/src/veritysetup/veritysetup.c b/src/veritysetup/veritysetup.c
index e58bae45d2293958c5bd4c7dcf6893dd02124b78..61973bf37a9fa6384a28a6296a54de7a90c58c66 100644 (file)
--- a/src/veritysetup/veritysetup.c
+++ b/src/veritysetup/veritysetup.c
@@ -30,7 +30,7 @@ static int help(void) {
 
         printf("%s attach VOLUME DATADEVICE HASHDEVICE ROOTHASH [OPTIONS]\n"
                "%s detach VOLUME\n\n"
-               "Attach or detach an integrity protected block device.\n"
+               "Attach or detach a verity protected block device.\n"
                "\nSee the %s for details.\n",
                program_invocation_short_name,
                program_invocation_short_name,

diff --git a/units/remote-veritysetup.target b/units/remote-veritysetup.target
index bd9f71acefa926284e40a9d8dcb312c312dcc33e..bad28c3f051bd1e9f168444778e3f49a0a33becb 100644 (file)
--- a/units/remote-veritysetup.target
+++ b/units/remote-veritysetup.target
@@ -8,7 +8,7 @@
 #  (at your option) any later version.
 
 [Unit]
-Description=Remote Verity Integrity Protected Volumes
+Description=Remote Verity Protected Volumes
 Documentation=man:systemd.special(7)
 After=remote-fs-pre.target veritysetup-pre.target
 DefaultDependencies=no

diff --git a/units/veritysetup-pre.target b/units/veritysetup-pre.target
index be065f335fba5c58aab1f0ad24832da097d21363..869575a9839c34542deaf266ac0feffdade4ed60 100644 (file)
--- a/units/veritysetup-pre.target
+++ b/units/veritysetup-pre.target
@@ -8,7 +8,7 @@
 #  (at your option) any later version.
 
 [Unit]
-Description=Local Verity Integrity Protected Volumes (Pre)
+Description=Local Verity Protected Volumes (Pre)
 Documentation=man:systemd.special(7)
 RefuseManualStart=yes
 Before=veritysetup.target

diff --git a/units/veritysetup.target b/units/veritysetup.target
index 0ac3ad3bd061a71008356aa093bea299339cca5e..c75b15375e2096206a68e4359d2f5afd100d3c61 100644 (file)
--- a/units/veritysetup.target
+++ b/units/veritysetup.target
@@ -8,5 +8,5 @@
 #  (at your option) any later version.
 
 [Unit]
-Description=Local Verity Integrity Protected Volumes
+Description=Local Verity Protected Volumes
 Documentation=man:systemd.special(7)