From 784eb570492fe8d7446633449681066591557d95 Mon Sep 17 00:00:00 2001 From: delphij Date: Tue, 11 Nov 2014 05:55:37 +0000 Subject: [PATCH] MFV r273747: Remove an extra copy of hv_kvp_daemon(8) [1]. While I'm there also correct typos in OptionalObsoleteFiles and add information of the command line options for hv_kvp_daemon(8). Reported by: jmg [1] Reviewed by: jmg git-svn-id: svn://svn.freebsd.org/base/stable/10@274372 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f --- contrib/hyperv/tools/hv_kvp_daemon.8 | 68 ++++++++++++----- share/man/man8/Makefile | 1 - share/man/man8/hv_kvp_daemon.8 | 96 ------------------------ tools/build/mk/OptionalObsoleteFiles.inc | 3 +- 4 files changed, 52 insertions(+), 116 deletions(-) delete mode 100644 share/man/man8/hv_kvp_daemon.8 diff --git a/contrib/hyperv/tools/hv_kvp_daemon.8 b/contrib/hyperv/tools/hv_kvp_daemon.8 index af574edef..ffdd53daf 100644 --- a/contrib/hyperv/tools/hv_kvp_daemon.8 +++ b/contrib/hyperv/tools/hv_kvp_daemon.8 @@ -22,41 +22,71 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd September 10, 2013 -.Dt HYPER-V 4 +.\" $FreeBSD$ +.Dd October 27, 2014 +.Dt HV_KVP_DAEMON 8 .Os .Sh NAME .Nm hv_kvp_daemon .Nd Hyper-V Key Value Pair Daemon .Sh SYNOPSIS -The \fBhv_kvp_daemon\fP daemon provides the ability to store, retrieve, modify and delete -Key Value pairs for FreeBSD guest partitions running on Hyper-V. +.Nm +.Op Fl dn .Sh DESCRIPTION +The +.Nm +daemon provides the ability to store, retrieve, modify and delete +Key Value pairs for +.Fx +guest partitions running on Hyper-V. +.Pp Hyper-V allows administrators to store custom metadata in the form -of Key Value pairs inside the FreeBSD guest partition. Administrators can +of Key Value pairs inside the +.Fx +guest partition. +Administrators can use Windows Powershell scripts to add, read, modify and delete such Key Value pairs. - -The \fBhv_kvp_daemon\fP accepts Key Value pair management requests from the -\fBhv_utils\fP driver and performs the actual metadata management on the file-system. - +.Pp +The +.Nm +accepts Key Value pair management requests from the +.Xr hv_utils 4 +driver and performs the actual metadata management on the file-system. +.Pp The same daemon and driver combination is also used to set and get -IP addresses from a FreeBSD guest. - +IP addresses from a +.Fx +guest. +.Pp The set functionality is particularly -useful when the FreeBSD guest is assigned a static IP address and is failed -over from one Hyper-V host to another. After failover, Hyper-V uses the set IP +useful when the +.Fx +guest is assigned a static IP address and is failed +over from one Hyper-V host to another. +After failover, Hyper-V uses the set IP functionality to automatically -update the FreeBSD guest's IP address to its original static value. - +update the +.Fx +guest's IP address to its original static value. +.Pp On the other hand, the get IP functionality is used to update the guest IP address in the Hyper-V management console window. +.Pp +The options are as follows: +.Bl -tag -width indent +.It Fl d +Run as regular process instead of a daemon for debugging purpose. +.It Fl n +Generate debugging output. +.El .Sh SEE ALSO .Xr hv_vmbus 4 , .Xr hv_utils 4 , .Xr hv_netvsc 4 , .Xr hv_storvsc 4 , -.Xr hv_ata_pci_disengage 4 +.Xr hv_ata_pci_disengage 4 , +.Xr hv_kvp 4 .Sh HISTORY Support for Hyper-V in the form of ports was first released in September 2013. The daemon was developed through a joint effort between Citrix Inc., @@ -64,5 +94,7 @@ Microsoft Corp. and Network Appliance Inc.. .Sh AUTHORS .An -nosplit .Fx -support for \fBhv_kvp_daemon\fP was first added by -.An Microsoft BSD Integration Services Team Aq bsdic@microsoft.com . +support for +.Nm +was first added by +.An Microsoft BSD Integration Services Team Aq Mt bsdic@microsoft.com . diff --git a/share/man/man8/Makefile b/share/man/man8/Makefile index 8a34b832a..2b803b629 100644 --- a/share/man/man8/Makefile +++ b/share/man/man8/Makefile @@ -3,7 +3,6 @@ MAN= crash.8 \ diskless.8 \ - hv_kvp_daemon.8 \ intro.8 \ nanobsd.8 \ picobsd.8 \ diff --git a/share/man/man8/hv_kvp_daemon.8 b/share/man/man8/hv_kvp_daemon.8 deleted file mode 100644 index a7171530c..000000000 --- a/share/man/man8/hv_kvp_daemon.8 +++ /dev/null @@ -1,96 +0,0 @@ -.\" $FreeBSD$ -.\" -.\" Copyright (c) 2012 Microsoft Corp. -.\" All rights reserved. -.\" -.\" Redistribution and use in source and binary forms, with or without -.\" modification, are permitted provided that the following conditions -.\" are met: -.\" 1. Redistributions of source code must retain the above copyright -.\" notice, this list of conditions and the following disclaimer. -.\" 2. Redistributions in binary form must reproduce the above copyright -.\" notice, this list of conditions and the following disclaimer in the -.\" documentation and/or other materials provided with the distribution. -.\" -.\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND -.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -.\" ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE -.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS -.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) -.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT -.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY -.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF -.\" SUCH DAMAGE. -.\" -.Dd September 10, 2013 -.Dt HYPER-V 4 -.Os -.Sh NAME -.Nm hv_kvp_daemon -.Nd Hyper-V Key Value Pair Daemon -.Sh SYNOPSIS -To compile this driver into the kernel, place the following lines in -the system kernel configuration file: -.Bd -ragged -offset indent -.Cd "device hyperv" -.Ed -.Sh DESCRIPTION -The -.Nm -daemon provides the ability to store, retrieve, modify and delete -Key Value pairs for -.Fx -guest partitions running on Hyper-V. -Hyper-V allows administrators to store custom metadata in the form -of Key Value pairs inside the -.Fx -guest partition. -Administrators can use Windows Powershell scripts to add, read, modify -and delete such Key Value pairs. -.Pp -The -.Nm -accepts Key Value pair management requests from the -.Xr hv_kvp 4 -driver and performs the actual metadata management on the file-system. -.Pp -The same daemon and driver combination is also used to set and get -IP addresses from a -.Fx -guest. -.Pp -The set functionality is particularly -useful when the -.Fx -guest is assigned a static IP address and is failed -over from one Hyper-V host to another. -After failover, Hyper-V uses the set IP functionality to automatically -update the -.Fx -guest's IP address to its original static value. -.Pp -On the other hand, the get IP functionality is used to update the guest IP -address in the Hyper-V management console window. -.Sh SEE ALSO -.Xr hv_vmbus 4 , -.Xr hv_utils 4 , -.Xr hv_netvsc 4 , -.Xr hv_storvsc 4 , -.Xr hv_ata_pci_disengage 4 , -.Xr hv_kvp 4 -.Sh HISTORY -Support for -.Nm -first appeared in -.Fx 10.0 . -The daemon was developed through a joint effort between Citrix Incorporated, -Microsoft Corporation, and Network Appliance Incorporated. -.Sh AUTHORS -.An -nosplit -.Fx -support for -.Nm -was first added by -.An Microsoft BSD Integration Services Team Aq bsdic@microsoft.com . diff --git a/tools/build/mk/OptionalObsoleteFiles.inc b/tools/build/mk/OptionalObsoleteFiles.inc index 724a52adb..64c44c861 100644 --- a/tools/build/mk/OptionalObsoleteFiles.inc +++ b/tools/build/mk/OptionalObsoleteFiles.inc @@ -4694,5 +4694,6 @@ OLD_FILES+=etc/devd/hyperv.conf OLD_FILES+=usr/libexec/hyperv/hv_set_ifconfig OLD_FILES+=usr/libexec/hyperv/hv_get_dns_info OLD_FILES+=usr/libexec/hyperv/hv_get_dhcp_info -OLD_FILES+=usr/sbin/hv_kvpd +OLD_FILES+=usr/sbin/hv_kvp_daemon +OLD_FILES+=usr/share/man/man8/hv_kvp_daemon.8.gz .endif -- 2.45.0