From 08b71f9f388a5dc7c07c62431bb97b90089a9a73 Mon Sep 17 00:00:00 2001 From: Matthew Dillon Date: Mon, 16 Jan 2012 11:30:22 -0800 Subject: [PATCH] hammer - Properly pass -S option to hammer run via remote ssh * Properly pass -S option to hammer run via remote ssh Reported-by: someone not me, sorry I forgot. --- sbin/hammer/cmd_mirror.c | 6 +++++- usr.bin/systat/systat.1 | 2 +- usr.bin/systat/vmstat.c | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/sbin/hammer/cmd_mirror.c b/sbin/hammer/cmd_mirror.c index dc759e76af..f5930f0dd1 100644 --- a/sbin/hammer/cmd_mirror.c +++ b/sbin/hammer/cmd_mirror.c @@ -1010,7 +1010,7 @@ hammer_cmd_mirror_copy(char **av, int ac, int streaming) pid_t pid1; pid_t pid2; int fds[2]; - const char *xav[16]; + const char *xav[32]; char tbuf[16]; char *ptr; int xac; @@ -1071,6 +1071,10 @@ again: xav[xac++] = "-t"; xav[xac++] = tbuf; } + if (SplitupOptStr) { + xav[xac++] = "-S"; + xav[xac++] = SplitupOptStr; + } if (streaming) xav[xac++] = "mirror-read-stream"; else diff --git a/usr.bin/systat/systat.1 b/usr.bin/systat/systat.1 index f79d79bd21..4cc1fb2fb3 100644 --- a/usr.bin/systat/systat.1 +++ b/usr.bin/systat/systat.1 @@ -347,7 +347,7 @@ If at most 4 disk devices are shown, extended virtual memory statistics are shown right to disk usage: pages zero filled on demand (`zfod'), pages optimized zero filled on demand (`ozfod'), -slow (i.e.\& non-optimized) zero fills percentage (`%slo-z'), +slow (i.e.\& non-optimized) zero fills percentage (`%sloz'), total pages freed (`tfree'). .Pp Under the date in the upper right hand quadrant are statistics diff --git a/usr.bin/systat/vmstat.c b/usr.bin/systat/vmstat.c index 39b7705e9a..8a36b9e8ff 100644 --- a/usr.bin/systat/vmstat.c +++ b/usr.bin/systat/vmstat.c @@ -340,7 +340,7 @@ labelkre(void) */ mvprintw(VMSTATROW + 11, VMSTATCOL - 6, "zfod"); mvprintw(VMSTATROW + 12, VMSTATCOL - 6, "ozfod"); - mvprintw(VMSTATROW + 13, VMSTATCOL - 6, "%%slo-z"); + mvprintw(VMSTATROW + 13, VMSTATCOL - 6, "%%sloz"); mvprintw(VMSTATROW + 14, VMSTATCOL - 6, "tfree"); extended_vm_stats = 1; } else { -- 2.41.0