-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
1 parent
476c3f6
commit 1210d2a
Showing
2 changed files
with
72 additions
and
72 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,7 +1,7 @@ | ||
Index: contrib/hyperv/daemons/hv_kvp_daemon.8 | ||
Index: contrib/hyperv/tools/hv_kvp_daemon.8 | ||
=================================================================== | ||
--- contrib/hyperv/daemons/hv_kvp_daemon.8 (revision 0) | ||
+++ contrib/hyperv/daemons/hv_kvp_daemon.8 (working copy) | ||
--- contrib/hyperv/tools/hv_kvp_daemon.8 (revision 0) | ||
+++ contrib/hyperv/tools/hv_kvp_daemon.8 (working copy) | ||
@@ -0,0 +1,68 @@ | ||
+.\" Copyright (c) 2014 Microsoft Corp. | ||
+.\" All rights reserved. | ||
|
@@ -72,7 +72,7 @@ Index: contrib/hyperv/daemons/hv_kvp_daemon.8 | |
+support for \fBhv_kvp_daemon\fP was first added by | ||
+.An Microsoft BSD Integration Services Team Aq [email protected] . | ||
|
||
Property changes on: contrib/hyperv/daemons/hv_kvp_daemon.8 | ||
Property changes on: contrib/hyperv/tools/hv_kvp_daemon.8 | ||
___________________________________________________________________ | ||
Added: svn:mime-type | ||
## -0,0 +1 ## | ||
|
@@ -86,10 +86,10 @@ Added: svn:eol-style | |
## -0,0 +1 ## | ||
+native | ||
\ No newline at end of property | ||
Index: contrib/hyperv/daemons/hv_kvp_daemon.c | ||
Index: contrib/hyperv/tools/hv_kvp_daemon.c | ||
=================================================================== | ||
--- contrib/hyperv/daemons/hv_kvp_daemon.c (revision 0) | ||
+++ contrib/hyperv/daemons/hv_kvp_daemon.c (working copy) | ||
--- contrib/hyperv/tools/hv_kvp_daemon.c (revision 0) | ||
+++ contrib/hyperv/tools/hv_kvp_daemon.c (working copy) | ||
@@ -0,0 +1,1431 @@ | ||
+/* | ||
+ * An implementation of key value pair (KVP) functionality for Linux. | ||
|
@@ -1523,7 +1523,7 @@ Index: contrib/hyperv/daemons/hv_kvp_daemon.c | |
+ } | ||
+} | ||
|
||
Property changes on: contrib/hyperv/daemons/hv_kvp_daemon.c | ||
Property changes on: contrib/hyperv/tools/hv_kvp_daemon.c | ||
___________________________________________________________________ | ||
Added: svn:mime-type | ||
## -0,0 +1 ## | ||
|
@@ -1537,10 +1537,10 @@ Added: svn:eol-style | |
## -0,0 +1 ## | ||
+native | ||
\ No newline at end of property | ||
Index: contrib/hyperv/daemons/kvp-install | ||
Index: contrib/hyperv/tools/kvp-install | ||
=================================================================== | ||
--- contrib/hyperv/daemons/kvp-install (revision 0) | ||
+++ contrib/hyperv/daemons/kvp-install (working copy) | ||
--- contrib/hyperv/tools/kvp-install (revision 0) | ||
+++ contrib/hyperv/tools/kvp-install (working copy) | ||
@@ -0,0 +1,41 @@ | ||
+#!/bin/sh | ||
+# | ||
|
@@ -1584,16 +1584,16 @@ Index: contrib/hyperv/daemons/kvp-install | |
+fi | ||
+exit 0 | ||
|
||
Property changes on: contrib/hyperv/daemons/kvp-install | ||
Property changes on: contrib/hyperv/tools/kvp-install | ||
___________________________________________________________________ | ||
Added: svn:executable | ||
## -0,0 +1 ## | ||
+* | ||
\ No newline at end of property | ||
Index: contrib/hyperv/daemons/scripts/hv_get_dhcp_info | ||
Index: contrib/hyperv/tools/scripts/hv_get_dhcp_info | ||
=================================================================== | ||
--- contrib/hyperv/daemons/scripts/hv_get_dhcp_info (revision 0) | ||
+++ contrib/hyperv/daemons/scripts/hv_get_dhcp_info (working copy) | ||
--- contrib/hyperv/tools/scripts/hv_get_dhcp_info (revision 0) | ||
+++ contrib/hyperv/tools/scripts/hv_get_dhcp_info (working copy) | ||
@@ -0,0 +1,28 @@ | ||
+#!/bin/sh | ||
+#THIs example script retrieves the DHCP state of a given interface. | ||
|
@@ -1623,10 +1623,10 @@ Index: contrib/hyperv/daemons/scripts/hv_get_dhcp_info | |
+echo "Disabled" | ||
+fi | ||
+ | ||
Index: contrib/hyperv/daemons/scripts/hv_get_dns_info | ||
Index: contrib/hyperv/tools/scripts/hv_get_dns_info | ||
=================================================================== | ||
--- contrib/hyperv/daemons/scripts/hv_get_dns_info (revision 0) | ||
+++ contrib/hyperv/daemons/scripts/hv_get_dns_info (working copy) | ||
--- contrib/hyperv/tools/scripts/hv_get_dns_info (revision 0) | ||
+++ contrib/hyperv/tools/scripts/hv_get_dns_info (working copy) | ||
@@ -0,0 +1,17 @@ | ||
+#!/bin/sh | ||
+#this example script parses /etc/resolv.conf to retrive DNS information. | ||
|
@@ -1645,10 +1645,10 @@ Index: contrib/hyperv/daemons/scripts/hv_get_dns_info | |
+#fi | ||
+cat /etc/resolv.conf 2>/dev/null | awk '/^nameserver/ { print $2 }' | ||
+ | ||
Index: contrib/hyperv/daemons/scripts/hv_set_ifconfig | ||
Index: contrib/hyperv/tools/scripts/hv_set_ifconfig | ||
=================================================================== | ||
--- contrib/hyperv/daemons/scripts/hv_set_ifconfig (revision 0) | ||
+++ contrib/hyperv/daemons/scripts/hv_set_ifconfig (working copy) | ||
--- contrib/hyperv/tools/scripts/hv_set_ifconfig (revision 0) | ||
+++ contrib/hyperv/tools/scripts/hv_set_ifconfig (working copy) | ||
@@ -0,0 +1,83 @@ | ||
+#!/bin/sh | ||
+ | ||
|
@@ -2812,6 +2812,10 @@ Index: sys/dev/hyperv/utilities/hv_kvp.c | |
|
||
Property changes on: sys/dev/hyperv/utilities/hv_kvp.c | ||
___________________________________________________________________ | ||
Added: svn:mime-type | ||
## -0,0 +1 ## | ||
+text/plain | ||
\ No newline at end of property | ||
Added: svn:keywords | ||
## -0,0 +1 ## | ||
+FreeBSD=%H | ||
|
@@ -2820,10 +2824,6 @@ Added: svn:eol-style | |
## -0,0 +1 ## | ||
+native | ||
\ No newline at end of property | ||
Added: svn:mime-type | ||
## -0,0 +1 ## | ||
+text/plain | ||
\ No newline at end of property | ||
Index: sys/dev/hyperv/utilities/hv_kvp.h | ||
=================================================================== | ||
--- sys/dev/hyperv/utilities/hv_kvp.h (revision 267674) | ||
|
@@ -3428,12 +3428,16 @@ Index: usr.sbin/hyperv/Makefile | |
+ | ||
+.include <bsd.own.mk> | ||
+ | ||
+SUBDIR = daemons | ||
+SUBDIR = tools | ||
+ | ||
+.include <bsd.subdir.mk> | ||
|
||
Property changes on: usr.sbin/hyperv/Makefile | ||
___________________________________________________________________ | ||
Added: svn:eol-style | ||
## -0,0 +1 ## | ||
+native | ||
\ No newline at end of property | ||
Added: svn:mime-type | ||
## -0,0 +1 ## | ||
+text/plain | ||
|
@@ -3442,20 +3446,16 @@ Added: svn:keywords | |
## -0,0 +1 ## | ||
+FreeBSD=%H | ||
\ No newline at end of property | ||
Added: svn:eol-style | ||
## -0,0 +1 ## | ||
+native | ||
\ No newline at end of property | ||
Index: usr.sbin/hyperv/daemons/Makefile | ||
Index: usr.sbin/hyperv/tools/Makefile | ||
=================================================================== | ||
--- usr.sbin/hyperv/daemons/Makefile (revision 0) | ||
+++ usr.sbin/hyperv/daemons/Makefile (working copy) | ||
--- usr.sbin/hyperv/tools/Makefile (revision 0) | ||
+++ usr.sbin/hyperv/tools/Makefile (working copy) | ||
@@ -0,0 +1,23 @@ | ||
+# $FreeBSD hyperv-ic Makefile $ | ||
+ | ||
+.include <bsd.own.mk> | ||
+ | ||
+HV_KVP_DAEMON_DISTDIR?= ${.CURDIR}/../../../contrib/hyperv/daemons | ||
+HV_KVP_DAEMON_DISTDIR?= ${.CURDIR}/../../../contrib/hyperv/tools | ||
+.PATH: ${HV_KVP_DAEMON_DISTDIR} | ||
+BINDIR = /usr/sbin | ||
+ | ||
|
@@ -3475,7 +3475,7 @@ Index: usr.sbin/hyperv/daemons/Makefile | |
+ | ||
+.include <bsd.prog.mk> | ||
|
||
Property changes on: usr.sbin/hyperv/daemons/Makefile | ||
Property changes on: usr.sbin/hyperv/tools/Makefile | ||
___________________________________________________________________ | ||
Added: svn:eol-style | ||
## -0,0 +1 ## | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,7 +1,7 @@ | ||
Index: contrib/hyperv/daemons/hv_kvp_daemon.8 | ||
Index: contrib/hyperv/tools/hv_kvp_daemon.8 | ||
=================================================================== | ||
--- contrib/hyperv/daemons/hv_kvp_daemon.8 (revision 0) | ||
+++ contrib/hyperv/daemons/hv_kvp_daemon.8 (working copy) | ||
--- contrib/hyperv/tools/hv_kvp_daemon.8 (revision 0) | ||
+++ contrib/hyperv/tools/hv_kvp_daemon.8 (working copy) | ||
@@ -0,0 +1,68 @@ | ||
+.\" Copyright (c) 2014 Microsoft Corp. | ||
+.\" All rights reserved. | ||
|
@@ -72,7 +72,7 @@ Index: contrib/hyperv/daemons/hv_kvp_daemon.8 | |
+support for \fBhv_kvp_daemon\fP was first added by | ||
+.An Microsoft BSD Integration Services Team Aq [email protected] . | ||
|
||
Property changes on: contrib/hyperv/daemons/hv_kvp_daemon.8 | ||
Property changes on: contrib/hyperv/tools/hv_kvp_daemon.8 | ||
___________________________________________________________________ | ||
Added: svn:eol-style | ||
## -0,0 +1 ## | ||
|
@@ -86,10 +86,10 @@ Added: svn:keywords | |
## -0,0 +1 ## | ||
+FreeBSD=%H | ||
\ No newline at end of property | ||
Index: contrib/hyperv/daemons/hv_kvp_daemon.c | ||
Index: contrib/hyperv/tools/hv_kvp_daemon.c | ||
=================================================================== | ||
--- contrib/hyperv/daemons/hv_kvp_daemon.c (revision 0) | ||
+++ contrib/hyperv/daemons/hv_kvp_daemon.c (working copy) | ||
--- contrib/hyperv/tools/hv_kvp_daemon.c (revision 0) | ||
+++ contrib/hyperv/tools/hv_kvp_daemon.c (working copy) | ||
@@ -0,0 +1,1431 @@ | ||
+/* | ||
+ * An implementation of key value pair (KVP) functionality for Linux. | ||
|
@@ -1523,8 +1523,12 @@ Index: contrib/hyperv/daemons/hv_kvp_daemon.c | |
+ } | ||
+} | ||
|
||
Property changes on: contrib/hyperv/daemons/hv_kvp_daemon.c | ||
Property changes on: contrib/hyperv/tools/hv_kvp_daemon.c | ||
___________________________________________________________________ | ||
Added: svn:eol-style | ||
## -0,0 +1 ## | ||
+native | ||
\ No newline at end of property | ||
Added: svn:mime-type | ||
## -0,0 +1 ## | ||
+text/plain | ||
|
@@ -1533,14 +1537,10 @@ Added: svn:keywords | |
## -0,0 +1 ## | ||
+FreeBSD=%H | ||
\ No newline at end of property | ||
Added: svn:eol-style | ||
## -0,0 +1 ## | ||
+native | ||
\ No newline at end of property | ||
Index: contrib/hyperv/daemons/kvp-install | ||
Index: contrib/hyperv/tools/kvp-install | ||
=================================================================== | ||
--- contrib/hyperv/daemons/kvp-install (revision 0) | ||
+++ contrib/hyperv/daemons/kvp-install (working copy) | ||
--- contrib/hyperv/tools/kvp-install (revision 0) | ||
+++ contrib/hyperv/tools/kvp-install (working copy) | ||
@@ -0,0 +1,41 @@ | ||
+#!/bin/sh | ||
+# | ||
|
@@ -1584,16 +1584,16 @@ Index: contrib/hyperv/daemons/kvp-install | |
+fi | ||
+exit 0 | ||
|
||
Property changes on: contrib/hyperv/daemons/kvp-install | ||
Property changes on: contrib/hyperv/tools/kvp-install | ||
___________________________________________________________________ | ||
Added: svn:executable | ||
## -0,0 +1 ## | ||
+* | ||
\ No newline at end of property | ||
Index: contrib/hyperv/daemons/scripts/hv_get_dhcp_info | ||
Index: contrib/hyperv/tools/scripts/hv_get_dhcp_info | ||
=================================================================== | ||
--- contrib/hyperv/daemons/scripts/hv_get_dhcp_info (revision 0) | ||
+++ contrib/hyperv/daemons/scripts/hv_get_dhcp_info (working copy) | ||
--- contrib/hyperv/tools/scripts/hv_get_dhcp_info (revision 0) | ||
+++ contrib/hyperv/tools/scripts/hv_get_dhcp_info (working copy) | ||
@@ -0,0 +1,28 @@ | ||
+#!/bin/sh | ||
+#THIs example script retrieves the DHCP state of a given interface. | ||
|
@@ -1623,10 +1623,10 @@ Index: contrib/hyperv/daemons/scripts/hv_get_dhcp_info | |
+echo "Disabled" | ||
+fi | ||
+ | ||
Index: contrib/hyperv/daemons/scripts/hv_get_dns_info | ||
Index: contrib/hyperv/tools/scripts/hv_get_dns_info | ||
=================================================================== | ||
--- contrib/hyperv/daemons/scripts/hv_get_dns_info (revision 0) | ||
+++ contrib/hyperv/daemons/scripts/hv_get_dns_info (working copy) | ||
--- contrib/hyperv/tools/scripts/hv_get_dns_info (revision 0) | ||
+++ contrib/hyperv/tools/scripts/hv_get_dns_info (working copy) | ||
@@ -0,0 +1,17 @@ | ||
+#!/bin/sh | ||
+#this example script parses /etc/resolv.conf to retrive DNS information. | ||
|
@@ -1645,10 +1645,10 @@ Index: contrib/hyperv/daemons/scripts/hv_get_dns_info | |
+#fi | ||
+cat /etc/resolv.conf 2>/dev/null | awk '/^nameserver/ { print $2 }' | ||
+ | ||
Index: contrib/hyperv/daemons/scripts/hv_set_ifconfig | ||
Index: contrib/hyperv/tools/scripts/hv_set_ifconfig | ||
=================================================================== | ||
--- contrib/hyperv/daemons/scripts/hv_set_ifconfig (revision 0) | ||
+++ contrib/hyperv/daemons/scripts/hv_set_ifconfig (working copy) | ||
--- contrib/hyperv/tools/scripts/hv_set_ifconfig (revision 0) | ||
+++ contrib/hyperv/tools/scripts/hv_set_ifconfig (working copy) | ||
@@ -0,0 +1,83 @@ | ||
+#!/bin/sh | ||
+ | ||
|
@@ -1735,7 +1735,7 @@ Index: contrib/hyperv/daemons/scripts/hv_set_ifconfig | |
+echo "Set IP-Injection Success" | ||
Index: etc/rc.d/Makefile | ||
=================================================================== | ||
--- etc/rc.d/Makefile (revision 267674) | ||
--- etc/rc.d/Makefile (revision 267677) | ||
+++ etc/rc.d/Makefile (working copy) | ||
@@ -54,6 +54,7 @@ | ||
hostid \ | ||
|
@@ -1768,7 +1768,7 @@ Index: etc/rc.d/hv_kvpd | |
+run_rc_command "$1" | ||
Index: usr.sbin/Makefile | ||
=================================================================== | ||
--- usr.sbin/Makefile (revision 267674) | ||
--- usr.sbin/Makefile (revision 267677) | ||
+++ usr.sbin/Makefile (working copy) | ||
@@ -33,6 +33,7 @@ | ||
getfmac \ | ||
|
@@ -1787,16 +1787,12 @@ Index: usr.sbin/hyperv/Makefile | |
+ | ||
+.include <bsd.own.mk> | ||
+ | ||
+SUBDIR = daemons | ||
+SUBDIR = tools | ||
+ | ||
+.include <bsd.subdir.mk> | ||
|
||
Property changes on: usr.sbin/hyperv/Makefile | ||
___________________________________________________________________ | ||
Added: svn:eol-style | ||
## -0,0 +1 ## | ||
+native | ||
\ No newline at end of property | ||
Added: svn:mime-type | ||
## -0,0 +1 ## | ||
+text/plain | ||
|
@@ -1805,16 +1801,20 @@ Added: svn:keywords | |
## -0,0 +1 ## | ||
+FreeBSD=%H | ||
\ No newline at end of property | ||
Index: usr.sbin/hyperv/daemons/Makefile | ||
Added: svn:eol-style | ||
## -0,0 +1 ## | ||
+native | ||
\ No newline at end of property | ||
Index: usr.sbin/hyperv/tools/Makefile | ||
=================================================================== | ||
--- usr.sbin/hyperv/daemons/Makefile (revision 0) | ||
+++ usr.sbin/hyperv/daemons/Makefile (working copy) | ||
--- usr.sbin/hyperv/tools/Makefile (revision 0) | ||
+++ usr.sbin/hyperv/tools/Makefile (working copy) | ||
@@ -0,0 +1,23 @@ | ||
+# $FreeBSD hyperv-ic Makefile $ | ||
+ | ||
+.include <bsd.own.mk> | ||
+ | ||
+HV_KVP_DAEMON_DISTDIR?= ${.CURDIR}/../../../contrib/hyperv/daemons | ||
+HV_KVP_DAEMON_DISTDIR?= ${.CURDIR}/../../../contrib/hyperv/tools | ||
+.PATH: ${HV_KVP_DAEMON_DISTDIR} | ||
+BINDIR = /usr/sbin | ||
+ | ||
|
@@ -1834,7 +1834,7 @@ Index: usr.sbin/hyperv/daemons/Makefile | |
+ | ||
+.include <bsd.prog.mk> | ||
|
||
Property changes on: usr.sbin/hyperv/daemons/Makefile | ||
Property changes on: usr.sbin/hyperv/tools/Makefile | ||
___________________________________________________________________ | ||
Added: svn:eol-style | ||
## -0,0 +1 ## | ||
|