make: generate

diff --git a/conf/example.conf.in b/conf/example.conf.in
index 294765c0e2e7242e2299f1ead4549471cf6320f2..273aa941d10b026b3bde13c033fea3f53dd7b93f 100644 (file)
--- a/conf/example.conf.in
+++ b/conf/example.conf.in
@@ -179,10 +179,16 @@ devices {
        # If PVs are restored or moved to a new system with new devices, but
        # an old system.devices remains with old device IDs, then search for
        # the PVIDs on new devices and update the device IDs in system.devices.
-       # The original device IDs must also not be found on the new system.
        # See device_ids_refresh_check for conditions that trigger the refresh.
-       # This configuration option has an automatic default value.
-       # device_ids_refresh = 1
+       # Set to 1 to enable a single automatic refresh attempt when a trigger
+       # condition is detected. Set to 0 to disable automatic refresh.
+       # Set to a value between 10 and 600 (in seconds) to enable an extended
+       # refresh period during which missing PVs will be located using the PVID,
+       # and the system.devices device ID updated if the PV is found on a new device.
+       # An extended refresh period may be useful if devices require refresh,
+       # but are attached to the system some time the initial refresh.
+       # This configuration option has an automatic default value.
+       # device_ids_refresh = 10
 
        # Configuration option devices/device_ids_refresh_checks.
        # Conditions that trigger device_ids_refresh to locate PVIDs on new devices.

diff --git a/man/lvmdevices.8_pregen b/man/lvmdevices.8_pregen
index b5aa855f51dae1b3d5426756ad0f4367dc909152..56f83a8f594d2f786125e16db3989abe1916b2d9 100644 (file)
--- a/man/lvmdevices.8_pregen
+++ b/man/lvmdevices.8_pregen
@@ -450,19 +450,43 @@ PART: the partition number if a PV exists on a partition.
 .P
 .SS device ID refresh
 .
-When LVM writes system.devices, it includes a local machine ID in the
-system.devices file (as PRODUCT_UUID or HOSTNAME.) When LVM reads
-system.devices, it compares this saved machine ID value to the current
-machine. This allows lvm to detect when system.devices has been copied
-or restored onto a different machine. When this happens, lvm switches
-its method for locating the PVs in system.devices, and locates PVs based
-on their PVID rather than the device ID (this involves scanning all devices
-on the system.) If a PVID is found on a device with a different device ID,
-then the device ID in system.devices is automatically updated to the new
-device ID.
-.P
-While this refresh process is triggered automatically by a new machine
-ID, it can also be performed manually with the following commands:
+When lvm writes system.devices, it includes a local machine ID in the
+system.devices file (as PRODUCT_UUID or HOSTNAME.)  When lvm reads
+system.devices, it compares this saved machine ID to the current machine,
+which allows lvm to detect when system.devices has been copied or restored
+onto a different machine.  When a machine change is detected, lvm enables
+a "device ID refresh" mode (configured by lvm.conf device_ids_refresh and
+device_ids_refresh_checks.)
+.P
+In refresh mode, a device in system.devices that is not found by its device ID
+will be located using its PVID.  LVM will scan all devices on the system to
+search for the missing PVIDs in system.devices.  If a PVID is found on a
+new device, the system.devices entry is updated with a new device ID matching
+the new device on which the PVID was found.  The refresh mode can be configured
+to run once, when the machine change is first detected, or can be enabled
+for period of time following the first refresh, or can be disabled
+entirely.
+.P
+.B device_ids_refresh = 0
+.br
+Disables refresh mode.
+.P
+.B device_ids_refresh = 1
+.br
+Enables one attempt to refresh device IDs when a machine
+change is first detected.
+.P
+.B device_ids_refresh =
+.I seconds
+.br
+The refresh mode is enabled for this number of seconds
+following the initial refresh attempt, or until all PVs
+in system.devices are found.  During this period, a
+REFRESH_UNTIL line appears in system.devices.  Accepted
+values are 10-600 seconds.
+.P
+In addition to the automated device ID refresh mode, refresh
+can be performed manually:
 .P
 Check if system.devices would be updated with new device IDs:
 .br