diff options
| author | Paul Zuchowski <[email protected]> | 2019-02-15 15:41:38 -0500 |
|---|---|---|
| committer | Brian Behlendorf <[email protected]> | 2019-02-15 12:41:38 -0800 |
| commit | 9c5e88b1ded19cb4b19b9d767d5c71b34c189540 (patch) | |
| tree | 08a51e07bb19bae06bdfbc61ae36b140514870ae /man/man8/zfs.8 | |
| parent | e73ab1b38cd099f3416eed0ab5576639383bbdcc (diff) | |
zfs should optionally send holds
Add -h switch to zfs send command to send dataset holds. If
holds are present in the stream, zfs receive will create them
on the target dataset, unless the zfs receive -h option is used
to skip receive of holds.
Reviewed-by: Alek Pinchuk <[email protected]>
Reviewed-by: loli10K <[email protected]>
Reviewed-by: Brian Behlendorf <[email protected]>
Reviewed by: Paul Dagnelie <[email protected]>
Signed-off-by: Paul Zuchowski <[email protected]>
Closes #7513
Diffstat (limited to 'man/man8/zfs.8')
| -rw-r--r-- | man/man8/zfs.8 | 20 |
1 files changed, 14 insertions, 6 deletions
diff --git a/man/man8/zfs.8 b/man/man8/zfs.8 index 4658c5b8b..551089609 100644 --- a/man/man8/zfs.8 +++ b/man/man8/zfs.8 @@ -195,7 +195,7 @@ .Ar snapshot bookmark .Nm .Cm send -.Op Fl DLPRbcenpvw +.Op Fl DLPRbcehnpvw .Op Oo Fl I Ns | Ns Fl i Oc Ar snapshot .Ar snapshot .Nm @@ -209,14 +209,14 @@ .Fl t Ar receive_resume_token .Nm .Cm receive -.Op Fl Fnsuv +.Op Fl Fhnsuv .Op Fl o Sy origin Ns = Ns Ar snapshot .Op Fl o Ar property Ns = Ns Ar value .Op Fl x Ar property .Ar filesystem Ns | Ns Ar volume Ns | Ns Ar snapshot .Nm .Cm receive -.Op Fl Fnsuv +.Op Fl Fhnsuv .Op Fl d Ns | Ns Fl e .Op Fl o Sy origin Ns = Ns Ar snapshot .Op Fl o Ar property Ns = Ns Ar value @@ -3408,7 +3408,7 @@ feature. .It Xo .Nm .Cm send -.Op Fl DLPRbcenpvw +.Op Fl DLPRbcehnpvw .Op Oo Fl I Ns | Ns Fl i Oc Ar snapshot .Ar snapshot .Xc @@ -3548,6 +3548,12 @@ Note that if you do not use this flag for sending encrypted datasets, data will be sent unencrypted and may be re-encrypted with a different encryption key on the receiving system, which will disable the ability to do a raw send to that system for incrementals. +.It Fl h, -holds +Generate a stream package that includes any snapshot holds (created with the +.Sy zfs hold +command), and indicating to +.Sy zfs receive +that the holds be applied to the dataset on the receiving system. .It Fl i Ar snapshot Generate an incremental stream from the first .Ar snapshot @@ -3743,7 +3749,7 @@ for more details. .It Xo .Nm .Cm receive -.Op Fl Fnsuv +.Op Fl Fhnsuv .Op Fl o Sy origin Ns = Ns Ar snapshot .Op Fl o Ar property Ns = Ns Ar value .Op Fl x Ar property @@ -3752,7 +3758,7 @@ for more details. .It Xo .Nm .Cm receive -.Op Fl Fnsuv +.Op Fl Fhnsuv .Op Fl d Ns | Ns Fl e .Op Fl o Sy origin Ns = Ns Ar snapshot .Op Fl o Ar property Ns = Ns Ar value @@ -3878,6 +3884,8 @@ snapshot as described in the paragraph above. Discard all but the last element of the sent snapshot's file system name, using that element to determine the name of the target file system for the new snapshot as described in the paragraph above. +.It Fl h +Skip the receive of holds. There is no effect if holds are not sent. .It Fl n Do not actually receive the stream. This can be useful in conjunction with the |