Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

zfs-recv.8 fixes, libzfs-sendrecv followup #13101

Closed
wants to merge 3 commits into from
Closed

zfs-recv.8 fixes, libzfs-sendrecv followup #13101

wants to merge 3 commits into from

Conversation

nabijaczleweli
Copy link
Contributor

Description

See individual commit messages. Fixes #13100.

How Has This Been Tested?

$ sudo env LD_LIBRARY_PATH="/home/nabijaczleweli/store/code/zfs/lib/libzfs/.libs:/home/nabijaczleweli/store/code/zfs/lib/libzfs_core/.libs:/home/nabijaczleweli/store/code/zfs/lib/libnvpair/.libs:/home/nabijaczleweli/store/code/zfs/lib/libuutil/.libs:$LD_LIBRARY_PATH" ./cmd/zfs/.libs/zfs recv -x encryption -x encryptionroot -x keylocation -x keyformat -ev tarta-zoot < pre-make
cannot receive: cannot receive: invalid property 'encryptionroot'

Types of changes

  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Performance enhancement (non-breaking change which improves efficiency)
  • Code cleanup (non-breaking change which makes code smaller or more readable)
  • Breaking change (fix or feature that would cause existing functionality to change)
  • Library ABI change (libzfs, libzfs_core, libnvpair, libuutil and libzfsbootenv)
  • Documentation (a change to man pages or other documentation)

Checklist:

  • My code follows the OpenZFS code style requirements.
  • I have updated the documentation accordingly.
  • I have read the contributing document.
  • I have added tests to cover my changes. – none apply
  • I have run the ZFS Test Suite with this change applied. – CI take my hand
  • All commit messages are properly formatted and contain Signed-off-by.

@nabijaczleweli
zfs-receive.8: fix Op Fl x Ar encryption in running text
18ddbd8 
Signed-off-by: Ahelenia Ziemiańska <nabijaczleweli@nabijaczleweli.xyz>
@nabijaczleweli
zfs-receive.8: properly unlight = in option setting
8322670 
Signed-off-by: Ahelenia Ziemiańska <nabijaczleweli@nabijaczleweli.xyz>
@nabijaczleweli
libzfs: sendrecv: fix missing error output for invalid properties
90c5fab 
Closes openzfs#13100
Fixes: 7633c0a ("libzfs: sendrecv:
fix unused, remove argsused")
Signed-off-by: Ahelenia Ziemiańska <nabijaczleweli@nabijaczleweli.xyz>
@behlendorf behlendorf added the Status: Accepted Ready to integrate (reviewed, tested) label Feb 14, 2022
behlendorf pushed a commit that referenced this pull request Feb 14, 2022
@nabijaczleweli @behlendorf
zfs-receive.8: properly unlight = in option setting
0c8aab9 
Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Reviewed-by: George Amanakis <gamanakis@gmail.com>
Reviewed-by: Ryan Moeller <freqlabs@FreeBSD.org>
Signed-off-by: Ahelenia Ziemiańska <nabijaczleweli@nabijaczleweli.xyz>
Closes #13101
behlendorf pushed a commit that referenced this pull request Feb 14, 2022
@nabijaczleweli @behlendorf
libzfs: sendrecv: fix missing error output for invalid properties
ae07fc1 
Fixes: 7633c0a ("libzfs: sendrecv:
fix unused, remove argsused")

Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Reviewed-by: George Amanakis <gamanakis@gmail.com>
Reviewed-by: Ryan Moeller <freqlabs@FreeBSD.org>
Signed-off-by: Ahelenia Ziemiańska <nabijaczleweli@nabijaczleweli.xyz>
Closes #13100
Closes #13101
tonyhutter pushed a commit to tonyhutter/zfs that referenced this pull request Feb 15, 2022
@nabijaczleweli @tonyhutter
zfs-receive.8: fix Op Fl x Ar encryption in running text
f90fd9c 
Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Reviewed-by: George Amanakis <gamanakis@gmail.com>
Reviewed-by: Ryan Moeller <freqlabs@FreeBSD.org>
Signed-off-by: Ahelenia Ziemiańska <nabijaczleweli@nabijaczleweli.xyz>
Closes openzfs#13101
tonyhutter pushed a commit to tonyhutter/zfs that referenced this pull request Feb 15, 2022
@nabijaczleweli @tonyhutter
zfs-receive.8: properly unlight = in option setting
f25aaa2 
Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Reviewed-by: George Amanakis <gamanakis@gmail.com>
Reviewed-by: Ryan Moeller <freqlabs@FreeBSD.org>
Signed-off-by: Ahelenia Ziemiańska <nabijaczleweli@nabijaczleweli.xyz>
Closes openzfs#13101
tonyhutter pushed a commit to tonyhutter/zfs that referenced this pull request Feb 16, 2022
@nabijaczleweli @tonyhutter
zfs-receive.8: fix Op Fl x Ar encryption in running text
d3fd6b4 
Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Reviewed-by: George Amanakis <gamanakis@gmail.com>
Reviewed-by: Ryan Moeller <freqlabs@FreeBSD.org>
Signed-off-by: Ahelenia Ziemiańska <nabijaczleweli@nabijaczleweli.xyz>
Closes openzfs#13101
tonyhutter pushed a commit to tonyhutter/zfs that referenced this pull request Feb 16, 2022
@nabijaczleweli @tonyhutter
zfs-receive.8: properly unlight = in option setting
59d3cd9 
Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Reviewed-by: George Amanakis <gamanakis@gmail.com>
Reviewed-by: Ryan Moeller <freqlabs@FreeBSD.org>
Signed-off-by: Ahelenia Ziemiańska <nabijaczleweli@nabijaczleweli.xyz>
Closes openzfs#13101
tonyhutter pushed a commit that referenced this pull request Mar 10, 2022
@nabijaczleweli @tonyhutter
zfs-receive.8: fix Op Fl x Ar encryption in running text
4b3fbf3 
Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Reviewed-by: George Amanakis <gamanakis@gmail.com>
Reviewed-by: Ryan Moeller <freqlabs@FreeBSD.org>
Signed-off-by: Ahelenia Ziemiańska <nabijaczleweli@nabijaczleweli.xyz>
Closes #13101
tonyhutter pushed a commit that referenced this pull request Mar 10, 2022
@nabijaczleweli @tonyhutter
zfs-receive.8: properly unlight = in option setting
336c6d5 
Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Reviewed-by: George Amanakis <gamanakis@gmail.com>
Reviewed-by: Ryan Moeller <freqlabs@FreeBSD.org>
Signed-off-by: Ahelenia Ziemiańska <nabijaczleweli@nabijaczleweli.xyz>
Closes #13101
nicman23 pushed a commit to nicman23/zfs that referenced this pull request Aug 22, 2022
@nabijaczleweli @nicman23
zfs-receive.8: fix Op Fl x Ar encryption in running text
c96019f 
Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Reviewed-by: George Amanakis <gamanakis@gmail.com>
Reviewed-by: Ryan Moeller <freqlabs@FreeBSD.org>
Signed-off-by: Ahelenia Ziemiańska <nabijaczleweli@nabijaczleweli.xyz>
Closes openzfs#13101
nicman23 pushed a commit to nicman23/zfs that referenced this pull request Aug 22, 2022
@nabijaczleweli @nicman23
zfs-receive.8: properly unlight = in option setting
5334708 
Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Reviewed-by: George Amanakis <gamanakis@gmail.com>
Reviewed-by: Ryan Moeller <freqlabs@FreeBSD.org>
Signed-off-by: Ahelenia Ziemiańska <nabijaczleweli@nabijaczleweli.xyz>
Closes openzfs#13101
nicman23 pushed a commit to nicman23/zfs that referenced this pull request Aug 22, 2022
@nabijaczleweli @nicman23
libzfs: sendrecv: fix missing error output for invalid properties
66a93b1 
Fixes: 7633c0a ("libzfs: sendrecv:
fix unused, remove argsused")

Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Reviewed-by: George Amanakis <gamanakis@gmail.com>
Reviewed-by: Ryan Moeller <freqlabs@FreeBSD.org>
Signed-off-by: Ahelenia Ziemiańska <nabijaczleweli@nabijaczleweli.xyz>
Closes openzfs#13100
Closes openzfs#13101
nicman23 pushed a commit to nicman23/zfs that referenced this pull request Aug 22, 2022
@nabijaczleweli @nicman23
zfs-receive.8: fix Op Fl x Ar encryption in running text
d843b41 
Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Reviewed-by: George Amanakis <gamanakis@gmail.com>
Reviewed-by: Ryan Moeller <freqlabs@FreeBSD.org>
Signed-off-by: Ahelenia Ziemiańska <nabijaczleweli@nabijaczleweli.xyz>
Closes openzfs#13101
nicman23 pushed a commit to nicman23/zfs that referenced this pull request Aug 22, 2022
@nabijaczleweli @nicman23
zfs-receive.8: properly unlight = in option setting
87fa1dc 
Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Reviewed-by: George Amanakis <gamanakis@gmail.com>
Reviewed-by: Ryan Moeller <freqlabs@FreeBSD.org>
Signed-off-by: Ahelenia Ziemiańska <nabijaczleweli@nabijaczleweli.xyz>
Closes openzfs#13101
nicman23 pushed a commit to nicman23/zfs that referenced this pull request Aug 22, 2022
@nabijaczleweli @nicman23
libzfs: sendrecv: fix missing error output for invalid properties
e5e644f 
Fixes: 7633c0a ("libzfs: sendrecv:
fix unused, remove argsused")

Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Reviewed-by: George Amanakis <gamanakis@gmail.com>
Reviewed-by: Ryan Moeller <freqlabs@FreeBSD.org>
Signed-off-by: Ahelenia Ziemiańska <nabijaczleweli@nabijaczleweli.xyz>
Closes openzfs#13100
Closes openzfs#13101
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@gamanakis gamanakis gamanakis approved these changes

@behlendorf behlendorf behlendorf approved these changes

Assignees
No one assigned
Labels
Status: Accepted Ready to integrate (reviewed, tested)
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

zfs recv fails silently when specifying -x encroot, regression against 2.1.2
3 participants
@nabijaczleweli @behlendorf @gamanakis