summaryrefslogtreecommitdiffstats
path: root/cddl/lib
diff options
context:
space:
mode:
authormav <mav@FreeBSD.org>2015-10-15 08:47:32 +0000
committermav <mav@FreeBSD.org>2015-10-15 08:47:32 +0000
commitc1c5997359a0319d0b6984203c5c3bb10c28274c (patch)
treeb9253bcfca2e03d198a8b51e1d9ba0bbfde9c787 /cddl/lib
parent504ba9ab05b649ed00b12d36a98f54a4b384e6b6 (diff)
downloadFreeBSD-src-c1c5997359a0319d0b6984203c5c3bb10c28274c.zip
FreeBSD-src-c1c5997359a0319d0b6984203c5c3bb10c28274c.tar.gz
MFV r289312: 2605 want to resume interrupted zfs send
Reviewed by: George Wilson <george.wilson@delphix.com> Reviewed by: Paul Dagnelie <pcd@delphix.com> Reviewed by: Richard Elling <Richard.Elling@RichardElling.com> Reviewed by: Xin Li <delphij@freebsd.org> Reviewed by: Arne Jansen <sensille@gmx.net> Approved by: Dan McDonald <danmcd@omniti.com> Author: Matthew Ahrens <mahrens@delphix.com> illumos/illumos-gate@9c3fd1216fa7fb02cfbc78a2518a686d54b48ab8 For more info, see: - slides http://www.slideshare.net/MatthewAhrens/openzfs-send-and-receive - video https://www.youtube.com/watch?v=iY44jPMvxog - manpage changes (for zfs resume -s and zfs send -t) - upcoming talk at the OpenZFS Developer Summit The TL;DR is: Use "zfs receive -s" to save the partially received state on failure. On failure, get the receive token with "zfs get receive_resume_token <fs>" Resume the send with "zfs send -t <token_value>" Relnotes: yes
Diffstat (limited to 'cddl/lib')
-rw-r--r--cddl/lib/libzfs/Makefile4
1 files changed, 2 insertions, 2 deletions
diff --git a/cddl/lib/libzfs/Makefile b/cddl/lib/libzfs/Makefile
index 19a3f2e..b960c9e 100644
--- a/cddl/lib/libzfs/Makefile
+++ b/cddl/lib/libzfs/Makefile
@@ -8,10 +8,10 @@
LIB= zfs
DPADD= ${LIBMD} ${LIBPTHREAD} ${LIBUMEM} ${LIBUTIL} ${LIBM} ${LIBNVPAIR} \
${LIBAVL} ${LIBZFS_CORE} ${LIBUUTIL} ${LIBBSDXML} ${LIBGEOM} \
- ${LIBNVPAIR}
+ ${LIBNVPAIR} ${LIBZ}
LDADD= -lmd -lpthread -lumem -lutil -luutil -lm -lnvpair -lavl \
- -lbsdxml -lgeom -lnvpair -lzfs_core
+ -lbsdxml -lgeom -lnvpair -lz -lzfs_core
SRCS= deviceid.c \
fsshare.c \
OpenPOWER on IntegriCloud