Blame SOURCES/lvm2-make-generate.patch

d16add
 man/lvconvert.8_pregen  |  2 +-
d16add
 man/lvmdevices.8_pregen | 79 ++++++++++++++++++++++++++++++++++++++++---------
d16add
 2 files changed, 66 insertions(+), 15 deletions(-)
d16add
d16add
diff --git a/man/lvconvert.8_pregen b/man/lvconvert.8_pregen
d16add
index d733ab6..4fafe5d 100644
d16add
--- a/man/lvconvert.8_pregen
d16add
+++ b/man/lvconvert.8_pregen
d16add
@@ -670,7 +670,7 @@ Convert LV to type thin-pool.
d16add
 .RE
d16add
 .P
d16add
 .RS 4
d16add
-LV1 types: linear striped cache raid error zero
d16add
+LV1 types: linear striped cache raid error zero writecache
d16add
 .RE
d16add
 .P
d16add
 \(em
d16add
diff --git a/man/lvmdevices.8_pregen b/man/lvmdevices.8_pregen
d16add
index 267ce96..fa85362 100644
d16add
--- a/man/lvmdevices.8_pregen
d16add
+++ b/man/lvmdevices.8_pregen
d16add
@@ -28,6 +28,8 @@ lvmdevices \(em Manage the devices file
d16add
 .br
d16add
     \fB--delpvid\fP \fIString\fP
d16add
 .br
d16add
+    \fB--deviceidtype\fP \fIString\fP
d16add
+.br
d16add
     \fB--devices\fP \fIPV\fP
d16add
 .br
d16add
     \fB--devicesfile\fP \fIString\fP
d16add
@@ -70,18 +72,18 @@ remove it from the devices file with lvmdevices --deldev.  The
d16add
 vgimportdevices(8) command adds all PVs from a VG to the devices file,
d16add
 and updates the VG metadata to include device IDs of the PVs.
d16add
 .P
d16add
-Commands adding new devices to the devices file necessarily look outside
d16add
-the existing devices file to find the devices to add.  pvcreate, vgcreate,
d16add
-and vgextend also look outside the devices file to create new PVs and add
d16add
-them to the devices file.
d16add
+Commands that add new devices to the devices file necessarily look outside
d16add
+the existing devices file to find the devices being added.  pvcreate,
d16add
+vgcreate, and vgextend also look outside the devices file to create new
d16add
+PVs and add those PVs to the devices file.
d16add
 .P
d16add
 LVM records devices in the devices file using hardware-specific IDs, such
d16add
 as the WWID, and attempts to use subsystem-specific IDs for virtual device
d16add
-types (which also aim to be as unique and stable as possible.)
d16add
-These device IDs are also written in the VG metadata.  When no hardware or
d16add
+types (which also aim to be as unique and stable as possible.) These
d16add
+device IDs are also written in the VG metadata.  When no hardware or
d16add
 virtual ID is available, lvm falls back using the unstable device name as
d16add
-the device ID.  When devnames are used, lvm performs extra scanning to
d16add
-find devices if their devname changes, e.g. after reboot.
d16add
+the device ID.  When devnames are used as IDs, lvm performs extra scanning
d16add
+to find devices if their devname changes, e.g. after reboot.
d16add
 .P
d16add
 When proper device IDs are used, an lvm command will not look at devices
d16add
 outside the devices file, but when devnames are used as a fallback, lvm
d16add
@@ -95,12 +97,13 @@ overriding the devices file.  The listed devices act as a sort of devices
d16add
 file in terms of limiting which devices lvm will see and use.  Devices
d16add
 that are not listed will appear to be missing to the lvm command.
d16add
 .P
d16add
-Multiple devices files can be kept in \fI#DEFAULT_SYS_DIR#/devices\fP, which allows lvm
d16add
-to be used with different sets of devices, e.g. system devices do not need
d16add
-to be exposed to a specific application, and the application can use lvm on
d16add
-its own devices that are not exposed to the system.  The option
d16add
---devicesfile <filename> is used to select the devices file to use with the
d16add
-command.  Without the option set, the default system devices file is used.
d16add
+Multiple devices files can be kept \fI#DEFAULT_SYS_DIR#/devices\fP, which
d16add
+allows lvm to be used with different sets of devices.  For example, system
d16add
+devices do not need to be exposed to a specific application, and the
d16add
+application can use lvm on its own devices that are not exposed to the
d16add
+system.  The option --devicesfile <filename> is used to select the devices
d16add
+file to use with the command.  Without the option set, the default system
d16add
+devices file is used.
d16add
 .P
d16add
 Setting --devicesfile "" causes lvm to not use a devices file.
d16add
 .P
d16add
@@ -120,6 +123,45 @@ if it does not yet exist.
d16add
 .P
d16add
 It is recommended to use lvm commands to make changes to the devices file to
d16add
 ensure proper updates.
d16add
+.P
d16add
+The device ID and device ID type are included in the VG metadata and can
d16add
+be reported with pvs -o deviceid,deviceidtype.  (Note that the lvmdevices
d16add
+command does not update VG metadata, but subsequent lvm commands modifying
d16add
+the metadata will include the device ID.)
d16add
+.P
d16add
+Possible device ID types are:
d16add
+.br
d16add
+.IP \[bu] 2
d16add
+.B sys_wwid
d16add
+uses the wwid reported by sysfs.  This is the first choice for non-virtual
d16add
+devices.
d16add
+.IP \[bu] 2
d16add
+.B sys_serial
d16add
+uses the serial number reported by sysfs.  This is the second choice for
d16add
+non-virtual devices.
d16add
+.IP \[bu] 2
d16add
+.B mpath_uuid
d16add
+is used for dm multipath devices, reported by sysfs.
d16add
+.IP \[bu] 2
d16add
+.B crypt_uuid
d16add
+is used for dm crypt devices, reported by sysfs.
d16add
+.IP \[bu] 2
d16add
+.B md_uuid
d16add
+is used for md devices, reported by sysfs.
d16add
+.B lvmlv_uuid
d16add
+is used if a PV is placed on top of an lvm LV, reported by sysfs.
d16add
+.IP \[bu] 2
d16add
+.B loop_file
d16add
+is used for loop devices, the backing file name repored by sysfs.
d16add
+.IP \[bu] 2
d16add
+.B devname
d16add
+the device name is used if no other type applies.
d16add
+.P
d16add
+
d16add
+The default choice for device ID type can be overriden using lvmdevices
d16add
+--addev --deviceidtype <type>.  If the specified type is available for the
d16add
+device it will be used, otherwise the device will be added using the type
d16add
+that would otherwise be chosen.
d16add
 .
d16add
 .SH USAGE
d16add
 .
d16add
@@ -169,6 +211,8 @@ Add a device to the devices file.
d16add
 .br
d16add
 .RS 4
d16add
 .ad l
d16add
+[    \fB--deviceidtype\fP \fIString\fP ]
d16add
+.br
d16add
 [ COMMON_OPTIONS ]
d16add
 .ad b
d16add
 .RE
d16add
@@ -308,6 +352,13 @@ Remove a device from the devices file.
d16add
 Remove a device with the PVID from the devices file.
d16add
 .
d16add
 .HP
d16add
+\fB--deviceidtype\fP \fIString\fP
d16add
+.br
d16add
+The type of device ID to use for the device.
d16add
+If the specified type is available for the device,
d16add
+then it will override the default type that lvm would use.
d16add
+.
d16add
+.HP
d16add
 \fB--devices\fP \fIPV\fP
d16add
 .br
d16add
 Devices that the command can use. This option can be repeated