projects
/
systembsd.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
b21074a
)
minor, make xen an uncertainty and move a comment that was misplaced
author
kremlin
<ian@kremlin.cc>
Fri, 8 Aug 2014 03:33:42 +0000
(22:33 -0500)
committer
kremlin
<ian@kremlin.cc>
Fri, 8 Aug 2014 03:33:42 +0000
(22:33 -0500)
src/interfaces/hostnamed/hostnamed.c
patch
|
blob
|
blame
|
history
diff --git
a/src/interfaces/hostnamed/hostnamed.c
b/src/interfaces/hostnamed/hostnamed.c
index 6d9117361da622aa9674ac6d92e4552065fe0930..0e5c93c4c681e21dd8c7a8ebb1e982a677958a29 100644
(file)
--- a/
src/interfaces/hostnamed/hostnamed.c
+++ b/
src/interfaces/hostnamed/hostnamed.c
@@
-34,7
+34,6
@@
#include "hostnamed-gen.h"
#include "hostnamed.h"
#include "hostnamed-gen.h"
#include "hostnamed.h"
-/* add any sysctl strings that suggest virtualization here */
/* format: {
* (1) string to be matched against runtime machine's sysctl output.
* can be either the exact string or a substring contained
/* format: {
* (1) string to be matched against runtime machine's sysctl output.
* can be either the exact string or a substring contained
@@
-88,6
+87,8
@@
gchar *KERN_NAME, *KERN_RELEASE, *KERN_VERS;
* NOTE paravirtualization on xen is only available for linuxes right now
* dmesg on linux systems reveals xen and virtualization method (HVM or PVM)
* but we will worry about those later */
* NOTE paravirtualization on xen is only available for linuxes right now
* dmesg on linux systems reveals xen and virtualization method (HVM or PVM)
* but we will worry about those later */
+
+/* add any sysctl strings that suggest virtualization here */
const struct SYSCTL_LOOKUP_TABLE chassis_indicator_table[] =
{
{ "QEMU Virtual CPU", "vm", NULL, FALSE, FALSE }, /* could be QEMU running in userspace or as part of KVM */
const struct SYSCTL_LOOKUP_TABLE chassis_indicator_table[] =
{
{ "QEMU Virtual CPU", "vm", NULL, FALSE, FALSE }, /* could be QEMU running in userspace or as part of KVM */
@@
-97,7
+98,7
@@
const struct SYSCTL_LOOKUP_TABLE chassis_indicator_table[] =
{ "VMware, Inc.", "vm", "drive-multidisk", TRUE, TRUE },
{ "VMware Virtual Platform", "vm", "drive-multidisk", TRUE, TRUE },
{ "Parallels", "vm", "drive-multidisk", TRUE, TRUE }, /* need verification */
{ "VMware, Inc.", "vm", "drive-multidisk", TRUE, TRUE },
{ "VMware Virtual Platform", "vm", "drive-multidisk", TRUE, TRUE },
{ "Parallels", "vm", "drive-multidisk", TRUE, TRUE }, /* need verification */
- { "Xen", "vm", "drive-multidisk",
TRUE, TRUE
}
+ { "Xen", "vm", "drive-multidisk",
FALSE, FALSE
}
}; /* TODO: chroots, etc. are the actual "containers", add them */
/* archs to check against when determining if machine is server */
}; /* TODO: chroots, etc. are the actual "containers", add them */
/* archs to check against when determining if machine is server */