marko10_000
/
btrfs-progs
forked from Mirrors/btrfs-progs
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

btrfs-progs: update send help strings and manpage 

- send accepts multiple subvolumes
- add missing option -e to man
- minor man formatting fix

Signed-off-by: David Sterba <dsterba@suse.cz>
Signed-off-by: Chris Mason <clm@fb.com>
master
David Sterba 2013-12-16 16:47:10 +01:00 committed by Chris Mason
parent 4b7656f3bf
commit ec3fbfcb55
2 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
cmds-send.c
View File

@ -728,9 +728,9 @@ out:
}
const char * const cmd_send_usage[] = {
"btrfs send [-ve] [-p <parent>] [-c <clone-src>] [-f <outfile>] <subvol>",
"Send the subvolume to stdout.",
"Sends the subvolume specified by <subvol> to stdout.",
"btrfs send [-ve] [-p <parent>] [-c <clone-src>] [-f <outfile>] <subvol> [<subvol>...]",
"Send the subvolume(s) to stdout.",
"Sends the subvolume(s) specified by <subvol> to stdout.",
"By default, this will send the whole subvolume. To do an incremental",
"send, use '-p <parent>'. If you want to allow btrfs to clone from",
"any additional local snapshots, use '-c <clone-src>' (multiple times",

14
man/btrfs.8.in
View File

@ -85,7 +85,7 @@ btrfs \- control a btrfs filesystem
\fBbtrfs\fP \fBinspect-internal rootid\fP \fI<path>\fP
.PP
.PP
\fBbtrfs\fP \fBsend\fP [-v] [-p \fI<parent>\fP] [-c \fI<clone-src>\fP] [-f \fI<outfile>\fP] \fI<subvol>\fP
\fBbtrfs\fP \fBsend\fP [-ve] [-p \fI<parent>\fP] [-c \fI<clone-src>\fP] [-f \fI<outfile>\fP] \fI<subvol>\fP [\fI<subvol>\fP...]
.PP
\fBbtrfs\fP \fBreceive\fP [-ve] [-f \fI<infile>\fP] \fI<mount>\fP
.PP
@ -625,16 +625,16 @@ subvolume return it's own tree id.
The result is undefined for the so-called empty subvolumes (identified by inode number 2).
.TP
\fBsend\fP [-v] [-p \fI<parent>\fP] [-c \fI<clone-src>\fP] [-f \fI<outfile>\fP] \fI<subvol>\fP
Send the subvolume to stdout.
Sends the subvolume specified by \fI<subvol>\fR to stdout.
\fBsend\fP [-ve] [-p \fI<parent>\fP] [-c \fI<clone-src>\fP] [-f \fI<outfile>\fP] \fI<subvol>\fP [\fI<subvol>...\fP]
Send the subvolume(s) to stdout.
Sends the subvolume(s) specified by \fI<subvol>\fR to stdout.
By default, this will send the whole subvolume. To do an incremental
send, use '\fI-p <parent>\fR'. If you want to allow btrfs to clone from
any additional local snapshots, use '\fI-c <clone-src>\fR' (multiple times
where applicable). You must not specify clone sources unless you
guarantee that these snapshots are exactly in the same state on both
sides, the sender and the receiver. It is allowed to omit the
'\fI-p <parent>\fR' option when '\fI-c <clone-src>\fR' options are given, in
sides, the sender and the receiver. It is allowed to omit the '\fI-p <parent>\fR'
option when '\fI-c <clone-src>\fR' options are given, in
which case '\fBbtrfs send\fP' will determine a suitable parent among the
clone sources itself.
.RS
@ -643,6 +643,8 @@ clone sources itself.
.IP "\fB-v\fP" 5
Enable verbose debug output. Each occurrence of this option increases the
verbose level more.
.IP "\fB-e\fP" 5
If sending multiple subvols at once, use the new format and omit the <end cmd> between the subvols.
.IP "\fB-p \fI<parent>\fP" 5
Send an incremental stream from \fI<parent>\fR to \fI<subvol>\fR.
.IP "\fB-c \fI<clone-src>\fP" 5