diff options
author | Ryan Moeller <[email protected]> | 2020-08-21 14:55:47 -0400 |
---|---|---|
committer | GitHub <[email protected]> | 2020-08-21 11:55:47 -0700 |
commit | 6706552ea6bdc74122b530ba5e8a6956f5160428 (patch) | |
tree | 826d23b023b7676ff90e202455ed25c5d233d7c8 /man/man1 | |
parent | 64025fa3a1f0f710f7f8678f2ac459b07ed9f88f (diff) |
Remove hard coded "Linux" OS from manpages
The recommended practice for `.Os` on FreeBSD is to not specify any
arguments. The correct OS name is used automatically.
Oddly enough, on the Linux distro I tested this on (CentOS 7), the man
pager defaulted to displaying "BSD" as the OS rather than "Linux". To
accommodate this, tack " Linux" back on in an install hook on Linux.
This is much simpler than removing it for FreeBSD when vendored in the
base system.
Reviewed-by: George Melikov <[email protected]>
Reviewed-by: Brian Behlendorf <[email protected]>
Signed-off-by: Ryan Moeller <[email protected]>
Closes #10760
Diffstat (limited to 'man/man1')
-rw-r--r-- | man/man1/Makefile.am | 10 | ||||
-rw-r--r-- | man/man1/zvol_wait.1 | 2 |
2 files changed, 11 insertions, 1 deletions
diff --git a/man/man1/Makefile.am b/man/man1/Makefile.am index cbfbcc0f3..8d7457a3e 100644 --- a/man/man1/Makefile.am +++ b/man/man1/Makefile.am @@ -1,2 +1,12 @@ dist_man_MANS = zhack.1 ztest.1 raidz_test.1 zvol_wait.1 arcstat.1 EXTRA_DIST = cstyle.1 + +if BUILD_LINUX +# The man pager in most Linux distros defaults to BSD instead of Linux +# when .Os is blank, but leaving it blank makes things a lot easier on +# FreeBSD when OpenZFS is vendored in the base system. +install-data-hook: + cd $(DESTDIR)$(mandir)/man1; \ + $(SED) ${ac_inplace} -e 's/^\.Os$$/.Os Linux/' \ + $(dist_man_MANS) +endif diff --git a/man/man1/zvol_wait.1 b/man/man1/zvol_wait.1 index 0366da537..839e1f144 100644 --- a/man/man1/zvol_wait.1 +++ b/man/man1/zvol_wait.1 @@ -1,6 +1,6 @@ .Dd July 5, 2019 .Dt ZVOL_WAIT 1 SMM -.Os Linux +.Os .Sh NAME .Nm zvol_wait .Nd Wait for ZFS volume links in |