Skip to content

auto-apply --raw send flag (ZREP_SEND_FLAGS) on encrypted datasets #144

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

Open
onlime wants to merge 1 commit into
base: master
Choose a base branch
from
Open

auto-apply --raw send flag (ZREP_SEND_FLAGS) on encrypted datasets #144

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 14 additions & 0 deletions zrep
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1314,6 +1314,13 @@ zrep_init(){
print Creating snapshot $snap
zfs snapshot $Z_SNAP_R $snap || clearquit $srcfs "Cannot create initial snapshot $snap"

# Set --raw zfs send flag for encrypted filesystem, if
# $ZREP_SEND_FLAGS was not already defined.
encryption=`$ZFSGETVAL encryption $srcfs`
if [[ "$encryption" != "off" ]]; then
ZREP_SEND_FLAGS=${ZREP_SEND_FLAGS:---raw}
fi

# Note that we may not want to use -p for normal zrep syncs
# We also should not use -F for normal recv. See workflow.txt
# Note: we may have to reset readonly=on, if we used -p on send...
Expand Down Expand Up @@ -1747,6 +1754,13 @@ _sync(){
if [[ "$token" == "-" ]] ; then token="" ; fi
fi

# Always set --raw zfs send flag for encrypted filesystem, if
# $ZREP_SEND_FLAGS was not already defined.
encryption=`$ZFSGETVAL encryption $srcfs`
if [[ "$encryption" != "off" ]]; then
ZREP_SEND_FLAGS=${ZREP_SEND_FLAGS:---raw}
fi

# Note: doing "-o $senttimeprop" sets prop on FILESYSTEM, not snap.
# So we dont do that usually

Expand Down
7 changes: 7 additions & 0 deletions zrep_snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -469,6 +469,13 @@ zrep_init(){
print Creating snapshot $snap
zfs snapshot $Z_SNAP_R $snap || clearquit $srcfs "Cannot create initial snapshot $snap"

# Set --raw zfs send flag for encrypted filesystem, if
# $ZREP_SEND_FLAGS was not already defined.
encryption=`$ZFSGETVAL encryption $srcfs`
if [[ "$encryption" != "off" ]]; then
ZREP_SEND_FLAGS=${ZREP_SEND_FLAGS:---raw}
fi

# Note that we may not want to use -p for normal zrep syncs
# We also should not use -F for normal recv. See workflow.txt
# Note: we may have to reset readonly=on, if we used -p on send...
Expand Down
7 changes: 7 additions & 0 deletions zrep_sync
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -304,6 +304,13 @@ _sync(){
if [[ "$token" == "-" ]] ; then token="" ; fi
fi

# Always set --raw zfs send flag for encrypted filesystem, if
# $ZREP_SEND_FLAGS was not already defined.
encryption=`$ZFSGETVAL encryption $srcfs`
if [[ "$encryption" != "off" ]]; then
ZREP_SEND_FLAGS=${ZREP_SEND_FLAGS:---raw}
fi

# Note: doing "-o $senttimeprop" sets prop on FILESYSTEM, not snap.
# So we dont do that usually

Expand Down