summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorpd <pd@cvs.openbsd.org>2019-01-18 01:24:08 +0000
committerpd <pd@cvs.openbsd.org>2019-01-18 01:24:08 +0000
commit532bade6dd16ec7ebee5cd8c05f5955dac154f68 (patch)
treeb7aa05346f3e0d80e4b33e69c521765f54806d23
parent7963999d9480b795bdba04b48ee4c049812d3251 (diff)
disable vmd/vmctl for i386
Next commit will delete vmm(4) for i386. Reasons to delete i386 vmm: - Been broken for a while, almost no one complained. - Had been falling out of sync from amd64 while it worked. - If your machine has vmx, you most probably can run amd64, so why not run that? ok mlarkin@ deraadt@
-rw-r--r--distrib/sets/lists/base/md.i3862
-rw-r--r--usr.sbin/vmctl/Makefile4
-rw-r--r--usr.sbin/vmd/Makefile4
3 files changed, 4 insertions, 6 deletions
diff --git a/distrib/sets/lists/base/md.i386 b/distrib/sets/lists/base/md.i386
index a15bbe3c35e..9880d788448 100644
--- a/distrib/sets/lists/base/md.i386
+++ b/distrib/sets/lists/base/md.i386
@@ -513,8 +513,6 @@
./usr/sbin/hotplugd
./usr/sbin/memconfig
./usr/sbin/pcidump
-./usr/sbin/vmctl
-./usr/sbin/vmd
./usr/sbin/wsconscfg
./usr/sbin/wsfontload
./usr/sbin/wsmoused
diff --git a/usr.sbin/vmctl/Makefile b/usr.sbin/vmctl/Makefile
index 6288d045110..4dab88fba7b 100644
--- a/usr.sbin/vmctl/Makefile
+++ b/usr.sbin/vmctl/Makefile
@@ -1,6 +1,6 @@
-# $OpenBSD: Makefile,v 1.5 2018/10/19 10:12:39 reyk Exp $
+# $OpenBSD: Makefile,v 1.6 2019/01/18 01:24:07 pd Exp $
-.if ${MACHINE} == "amd64" || ${MACHINE} == "i386"
+.if ${MACHINE} == "amd64"
.PATH: ${.CURDIR}/../vmd
diff --git a/usr.sbin/vmd/Makefile b/usr.sbin/vmd/Makefile
index afe8ce1072b..8645df7aecf 100644
--- a/usr.sbin/vmd/Makefile
+++ b/usr.sbin/vmd/Makefile
@@ -1,6 +1,6 @@
-# $OpenBSD: Makefile,v 1.21 2018/12/10 21:30:33 claudio Exp $
+# $OpenBSD: Makefile,v 1.22 2019/01/18 01:24:07 pd Exp $
-.if ${MACHINE} == "amd64" || ${MACHINE} == "i386"
+.if ${MACHINE} == "amd64"
PROG= vmd
SRCS= vmd.c control.c log.c priv.c proc.c config.c vmm.c