zstreamdump: replace with link to zstream
zstreamdump(8) was in quite a bad state, and the wrapper didn't work if invoked without /sbin in $PATH Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov> Signed-off-by: Ahelenia Ziemiańska <nabijaczleweli@nabijaczleweli.xyz> Closes #12015
This commit is contained in:
parent
93ef500388
commit
dd00925e8d
@ -1,4 +1,4 @@
|
||||
SUBDIRS = zfs zpool zdb zhack zinject zstream zstreamdump ztest
|
||||
SUBDIRS = zfs zpool zdb zhack zinject zstream ztest
|
||||
SUBDIRS += fsck_zfs vdev_id raidz_test zfs_ids_to_path
|
||||
SUBDIRS += zpool_influxdb
|
||||
|
||||
|
@ -15,3 +15,6 @@ zstream_LDADD = \
|
||||
$(abs_top_builddir)/lib/libnvpair/libnvpair.la
|
||||
|
||||
include $(top_srcdir)/config/CppCheck.am
|
||||
|
||||
install-exec-hook:
|
||||
$(LN_S) zstream $(DESTDIR)$(sbindir)/zstreamdump
|
||||
|
@ -49,6 +49,11 @@ zstream_usage(void)
|
||||
int
|
||||
main(int argc, char *argv[])
|
||||
{
|
||||
char *basename = strrchr(argv[0], '/');
|
||||
basename = basename ? (basename + 1) : argv[0];
|
||||
if (argc >= 1 && strcmp(basename, "zstreamdump") == 0)
|
||||
return (zstream_do_dump(argc, argv));
|
||||
|
||||
if (argc < 2)
|
||||
zstream_usage();
|
||||
|
||||
|
@ -1 +0,0 @@
|
||||
dist_sbin_SCRIPTS = zstreamdump
|
@ -1,3 +0,0 @@
|
||||
#!/bin/sh
|
||||
|
||||
exec zstream dump "$@"
|
@ -48,6 +48,7 @@ AC_CONFIG_HEADERS([zfs_config.h], [
|
||||
LT_INIT
|
||||
AC_PROG_INSTALL
|
||||
AC_PROG_CC
|
||||
AC_PROG_LN_S
|
||||
PKG_PROG_PKG_CONFIG
|
||||
AM_PROG_AS
|
||||
AM_PROG_CC_C_O
|
||||
@ -83,7 +84,6 @@ AC_CONFIG_FILES([
|
||||
cmd/zinject/Makefile
|
||||
cmd/zpool/Makefile
|
||||
cmd/zstream/Makefile
|
||||
cmd/zstreamdump/Makefile
|
||||
cmd/ztest/Makefile
|
||||
cmd/zvol_id/Makefile
|
||||
cmd/zvol_wait/Makefile
|
||||
|
@ -20,7 +20,7 @@
|
||||
.\"
|
||||
.\"
|
||||
.\" Copyright (c) 2020 by Delphix. All rights reserved.
|
||||
.Dd March 25, 2020
|
||||
.Dd May 8, 2021
|
||||
.Dt ZSTREAM 8
|
||||
.Os
|
||||
.Sh NAME
|
||||
@ -67,6 +67,12 @@ Print metadata for each record.
|
||||
Dump data contained in each record.
|
||||
Implies verbose.
|
||||
.El
|
||||
.Pp
|
||||
The
|
||||
.Nm zstreamdump
|
||||
alias is provided for compatibility and is equivalent to running
|
||||
.Nm
|
||||
.Cm dump .
|
||||
.It Xo
|
||||
.Nm
|
||||
.Cm token
|
||||
|
@ -1,58 +0,0 @@
|
||||
'\" te
|
||||
.\" Copyright (c) 2009, Sun Microsystems, Inc. All Rights Reserved
|
||||
.\" The contents of this file are subject to the terms of the Common Development and Distribution License (the "License"). You may not use this file except in compliance with the License. You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE or http://www.opensolaris.org/os/licensing.
|
||||
.\" See the License for the specific language governing permissions and limitations under the License. When distributing Covered Code, include this CDDL HEADER in each file and include the License file at usr/src/OPENSOLARIS.LICENSE. If applicable, add the following below this CDDL HEADER, with
|
||||
.\" the fields enclosed by brackets "[]" replaced with your own identifying information: Portions Copyright [yyyy] [name of copyright owner]
|
||||
.TH ZSTREAMDUMP 8 "Aug 24, 2020" OpenZFS
|
||||
.SH NAME
|
||||
zstreamdump \- filter data in zfs send stream
|
||||
.SH SYNOPSIS
|
||||
.LP
|
||||
.nf
|
||||
\fBzstreamdump\fR [\fB-C\fR] [\fB-v\fR] [\fB-d\fR]
|
||||
.fi
|
||||
|
||||
.SH DESCRIPTION
|
||||
.sp
|
||||
.LP
|
||||
The \fBzstreamdump\fR utility reads from the output of the \fBzfs send\fR
|
||||
command, then displays headers and some statistics from that output. See
|
||||
\fBzfs\fR(8).
|
||||
.SH OPTIONS
|
||||
.sp
|
||||
.LP
|
||||
The following options are supported:
|
||||
.sp
|
||||
.ne 2
|
||||
.na
|
||||
\fB-C\fR
|
||||
.ad
|
||||
.sp .6
|
||||
.RS 4n
|
||||
Suppress the validation of checksums.
|
||||
.RE
|
||||
|
||||
.sp
|
||||
.ne 2
|
||||
.na
|
||||
\fB-v\fR
|
||||
.ad
|
||||
.sp .6
|
||||
.RS 4n
|
||||
Verbose. Dump all headers, not only begin and end headers.
|
||||
.RE
|
||||
|
||||
.sp
|
||||
.ne 2
|
||||
.na
|
||||
\fB-d\fR
|
||||
.ad
|
||||
.sp .6
|
||||
.RS 4n
|
||||
Dump contents of blocks modified. Implies verbose.
|
||||
.RE
|
||||
|
||||
.SH SEE ALSO
|
||||
.sp
|
||||
.LP
|
||||
\fBzfs\fR(8)
|
1
man/man8/zstreamdump.8
Symbolic link
1
man/man8/zstreamdump.8
Symbolic link
@ -0,0 +1 @@
|
||||
zstream.8
|
Loading…
Reference in New Issue
Block a user