From 9a2a6ec4e31abe4b58b140767a82200f79c8645f Mon Sep 17 00:00:00 2001 From: Tony Asleson Date: Wed, 13 Oct 2021 14:18:12 -0500 Subject: [PATCH] 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. --- man/systemd-veritysetup-generator.xml | 8 ++++---- man/systemd-veritysetup@.service.xml | 8 ++++---- man/veritytab.xml | 14 +++++++------- src/veritysetup/veritysetup-generator.c | 2 +- src/veritysetup/veritysetup.c | 2 +- units/remote-veritysetup.target | 2 +- units/veritysetup-pre.target | 2 +- units/veritysetup.target | 2 +- 8 files changed, 20 insertions(+), 20 deletions(-) diff --git a/man/systemd-veritysetup-generator.xml b/man/systemd-veritysetup-generator.xml index bf5e705f83..3c9ee6788f 100644 --- a/man/systemd-veritysetup-generator.xml +++ b/man/systemd-veritysetup-generator.xml @@ -17,7 +17,7 @@ systemd-veritysetup-generator - Unit generator for integrity protected block devices + Unit generator for verity protected block devices @@ -28,7 +28,7 @@ Description systemd-veritysetup-generator 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 systemd-veritysetup@.service8 units as necessary. @@ -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. @@ -76,7 +76,7 @@ systemd.verity_root_hash= 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 roothash= argument (see above). diff --git a/man/systemd-veritysetup@.service.xml b/man/systemd-veritysetup@.service.xml index 70f08374e2..0f21c2fbbf 100644 --- a/man/systemd-veritysetup@.service.xml +++ b/man/systemd-veritysetup@.service.xml @@ -18,7 +18,7 @@ systemd-veritysetup@.service systemd-veritysetup - Disk integrity protection logic + Disk verity protection logic @@ -29,12 +29,12 @@ Description - systemd-veritysetup@.service is a service responsible for setting up integrity - protection (verity) block devices. It should be instantiated for each device that requires integrity + systemd-veritysetup@.service is a service responsible for setting up verity + protection block devices. It should be instantiated for each device that requires verity protection. At early boot and when the system manager configuration is reloaded kernel command line configuration for - integrity protected block devices is translated into systemd-veritysetup@.service units by + verity protected block devices is translated into systemd-veritysetup@.service units by systemd-veritysetup-generator8. systemd-veritysetup@.service calls systemd-veritysetup. diff --git a/man/veritytab.xml b/man/veritytab.xml index d29e9f5f2d..28dce1fe38 100644 --- a/man/veritytab.xml +++ b/man/veritytab.xml @@ -33,12 +33,12 @@ This is based on crypttab(5). Description The /etc/veritytab file describes - verity integrity protected block devices that are set up during + verity protected block devices that are set up during system boot. Empty lines and lines starting with the # 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. Each line is in the formvolume-name data-device hash-device roothash options @@ -65,7 +65,7 @@ This is based on crypttab(5). - Defines what to do if data integrity problem is detected (data corruption). Without these + 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 --ignore-corruption option the corruption is only logged. With --restart-on-corruption or --panic-on-corruption the kernel is restarted (panicked) immediately. @@ -149,18 +149,18 @@ This is based on crypttab(5). - Setup this verity integrity protected block device in the initramfs, similarly to + Setup this verity protected block device in the initramfs, similarly to systemd.mount5 units marked with . Although it's not necessary to mark the mount entry for the root file system with , 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. - All other verity integrity protected block devices that contain file systems mounted in the + All other verity protected block devices that contain file systems mounted in the initramfs should use this option. @@ -176,7 +176,7 @@ This is based on crypttab(5). Examples /etc/veritytab example - Set up two verity integrity protected block devices. One using device blocks, another using files. + Set up two verity protected block devices. One using device blocks, another using files. 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 1c68d28364..13181b86ed 100644 --- 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 e58bae45d2..61973bf37a 100644 --- 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 bd9f71acef..bad28c3f05 100644 --- 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 be065f335f..869575a983 100644 --- 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 0ac3ad3bd0..c75b15375e 100644 --- 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)