From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 22429 invoked by alias); 13 Jan 2010 01:55:05 -0000 Received: (qmail 22372 invoked by uid 9805); 13 Jan 2010 01:55:05 -0000 Date: Wed, 13 Jan 2010 01:55:00 -0000 Message-ID: <20100113015505.22369.qmail@sourceware.org> From: snitzer@sourceware.org To: lvm-devel@redhat.com, lvm2-cvs@sourceware.org Subject: LVM2/man lvconvert.8.in Mailing-List: contact lvm2-cvs-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Post: List-Help: , Sender: lvm2-cvs-owner@sourceware.org X-SW-Source: 2010-01/txt/msg00076.txt.bz2 CVSROOT: /cvs/lvm2 Module name: LVM2 Changes by: snitzer@sourceware.org 2010-01-13 01:55:05 Modified files: man : lvconvert.8.in Log message: Update lvconvert manpage for snapshot --merge Patches: http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/man/lvconvert.8.in.diff?cvsroot=lvm2&r1=1.12&r2=1.13 --- LVM2/man/lvconvert.8.in 2010/01/12 14:00:51 1.12 +++ LVM2/man/lvconvert.8.in 2010/01/13 01:55:05 1.13 @@ -31,7 +31,18 @@ [\-\-version] .br OriginalLogicalVolume[Path] SnapshotLogicalVolume[Path] +.br +.br +.B lvconvert +\-\-merge [\-b|\-\-background] [\-i|\-\-interval Seconds] +[\-h|\-?|\-\-help] +[\-v|\-\-verbose] +[\-\-version] +SnapshotLogicalVolume[Path] +.br + +.br .B lvconvert \-\-repair [\-h|\-?|\-\-help] @@ -54,7 +65,8 @@ .SH OPTIONS See \fBlvm\fP for common options. .br -Exactly one of \-\-splitmirrors, \-\-mirrors, \-\-repair or \-\-snapshot arguments required. +Exactly one of \-\-splitmirrors, \-\-mirrors, \-\-repair, \-\-snapshot +or \-\-merge arguments is required. .br .TP .I \-m, \-\-mirrors Mirrors @@ -119,6 +131,17 @@ .I \-Z, \-\-zero y|n Controls zeroing of the first KB of data in the snapshot. If the volume is read-only the snapshot will not be zeroed. +.TP +.I \-\-merge +Merges a snapshot into its origin volume. If both the origin and snapshot volume +are not open the merge will start immediately. Otherwise, the merge will start +the first time either the origin or snapshot are activated and both are closed. +Merging a snapshot into an origin that cannot be closed, for example a root +filesystem, is deferred until the next time the origin volume is activated. +When merging starts, the resulting logical volume will have the origin's name, +minor number and UUID. While the merge is in progress, reads or writes to the +origin appear as they were directed to the snapshot being merged. When the +merge finishes, the merged snapshot is removed. .br @@ -171,6 +194,11 @@ converts mirror logical volume "vg00/lvmirror1" to linear, freeing physical extents from /dev/sda. +.br +"lvconvert --merge vg00/lvol1_snap" +.br +merges "vg00/lvol1_snap" into its origin. + .SH SEE ALSO .BR lvm (8), .BR vgcreate (8),