Switch to xenodm(1).

Do it now deraadt@

8 files changed, 22 insertions, 22 deletions

diff --git a/distrib/miniroot/install.sub b/distrib/miniroot/install.sub
index ed656a7e071..3549b851842 100644
--- a/distrib/miniroot/install.sub
+++ b/distrib/miniroot/install.sub
@@ -1,5 +1,5 @@
 #!/bin/ksh
-#	$OpenBSD: install.sub,v 1.975 2017/02/25 12:57:03 rpe Exp $
+#	$OpenBSD: install.sub,v 1.976 2017/02/26 16:51:18 matthieu Exp $
 #
 # Copyright (c) 1997-2015 Todd Miller, Theo de Raadt, Ken Westerback
 # Copyright (c) 2015, Robert Peichaer <rpe@openbsd.org>
@@ -1885,7 +1885,7 @@ questions() {
 				APERTURE=$MDXAPERTURE
 		fi
 		if [[ -n $MDXDM && $resp != n ]]; then
-			ask_yn "Do you want the X Window System to be started by xdm(1)?"
+			ask_yn "Do you want the X Window System to be started by xenodm(1)?"
 			START_XDM=$resp
 		fi
 	fi
@@ -2470,8 +2470,8 @@ apply() {
 		echo "machdep.allowaperture=$APERTURE # See xf86(4)" \
 			>>/mnt/etc/sysctl.conf
 
-	[[ $START_XDM == y && -x /mnt/usr/X11R6/bin/xdm ]] &&
-		echo "xdm_flags=" >>/mnt/etc/rc.conf.local
+	[[ $START_XDM == y && -x /mnt/usr/X11R6/bin/xenodm ]] &&
+		echo "xenodm_flags=" >>/mnt/etc/rc.conf.local
 
 	if [[ $DEFCONS == y ]]; then
 		cp /mnt/etc/ttys /tmp/i/ttys
diff --git a/distrib/sets/lists/base/mi b/distrib/sets/lists/base/mi
index 2077e2fbc6c..6778b4cc816 100644
--- a/distrib/sets/lists/base/mi
+++ b/distrib/sets/lists/base/mi
@@ -202,7 +202,7 @@
 ./etc/rc.d/vmd
 ./etc/rc.d/watchdogd
 ./etc/rc.d/wsmoused
-./etc/rc.d/xdm
+./etc/rc.d/xenodm
 ./etc/rc.d/ypbind
 ./etc/rc.d/ypldap
 ./etc/rc.d/ypserv
diff --git a/etc/Makefile b/etc/Makefile
index f8cd0a5f51f..127d850eee4 100644
--- a/etc/Makefile
+++ b/etc/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.450 2017/02/12 08:56:17 landry Exp $
+#	$OpenBSD: Makefile,v 1.451 2017/02/26 16:51:18 matthieu Exp $
 
 .include <bsd.own.mk>
 
@@ -57,7 +57,7 @@ RCDAEMONS=amd apmd bgpd bootparamd cron dhcpd dhcrelay dvmrpd eigrpd ftpd \
 	pflogd portmap radiusd rarpd rbootd rebound relayd ripd route6d \
 	rtadvd sasyncd sensorsd slowcgi smtpd sndiod snmpd spamd \
 	spamlogd sshd statd switchd syslogd tftpd tftpproxy unbound \
-	vmd watchdogd wsmoused xdm ypbind ypldap ypserv
+	vmd watchdogd wsmoused xenodm ypbind ypldap ypserv
 
 MISETS=	base${OSrev}.tgz comp${OSrev}.tgz man${OSrev}.tgz game${OSrev}.tgz
 
diff --git a/etc/mtree/BSD.x11.dist b/etc/mtree/BSD.x11.dist
index c54c704e227..781a8db548d 100644
--- a/etc/mtree/BSD.x11.dist
+++ b/etc/mtree/BSD.x11.dist
@@ -1,4 +1,4 @@
-#       $OpenBSD: BSD.x11.dist,v 1.43 2016/09/11 14:05:04 matthieu Exp $
+#       $OpenBSD: BSD.x11.dist,v 1.44 2017/02/26 16:51:18 matthieu Exp $
 
 /set type=dir uname=root gname=wheel mode=0755
 .
@@ -8,7 +8,7 @@
             ..
             twm
             ..
-            xdm
+            xenodm
                 pixmaps
                 ..
             ..
diff --git a/etc/rc b/etc/rc
index f82168a3f7d..342c1353740 100644
--- a/etc/rc
+++ b/etc/rc
@@ -1,4 +1,4 @@
-#	$OpenBSD: rc,v 1.492 2016/12/27 09:17:52 jca Exp $
+#	$OpenBSD: rc,v 1.493 2017/02/26 16:51:18 matthieu Exp $
 
 # System startup script run by init on autoboot or after single-user.
 # Output and error are redirected to console by init, and the console is the
@@ -566,7 +566,7 @@ ifconfig -g carp -carpdemote 128	# Disable carp interlock.
 mixerctl_conf
 
 echo -n 'starting local daemons:'
-start_daemon apmd sensorsd hotplugd watchdogd cron wsmoused xdm
+start_daemon apmd sensorsd hotplugd watchdogd cron wsmoused xenodm
 echo '.'
 
 date
diff --git a/etc/rc.conf b/etc/rc.conf
index 00619d216e1..9048478bf80 100644
--- a/etc/rc.conf
+++ b/etc/rc.conf
@@ -1,4 +1,4 @@
-#	$OpenBSD: rc.conf,v 1.212 2016/10/06 20:20:41 reyk Exp $
+#	$OpenBSD: rc.conf,v 1.213 2017/02/26 16:51:18 matthieu Exp $
 
 # DO NOT EDIT THIS FILE!!
 #
@@ -73,7 +73,7 @@ vmd_flags=NO
 watchdogd_flags=NO
 wsmoused_flags=NO	# for enabling console mouse support (i386 alpha amd64)
 			# for ps/2 or usb mice: "", serial: "-p /dev/cua00"
-xdm_flags=NO		# on some architectures, you must also
+xenodm_flags=NO		# on some architectures, you must also
 			# disable console getty in /etc/ttys
 
 # services related to RPC, NFS, and YP
diff --git a/etc/rc.d/xdm b/etc/rc.d/xdm
deleted file mode 100644
index d9768fb819a..00000000000
--- a/etc/rc.d/xdm
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/sh
-#
-# $OpenBSD: xdm,v 1.1 2011/07/07 18:42:17 robert Exp $
-
-daemon="/usr/X11R6/bin/xdm"
-
-. /etc/rc.d/rc.subr
-
-rc_cmd $1
diff --git a/etc/rc.d/xenodm b/etc/rc.d/xenodm
new file mode 100644
index 00000000000..d8c85a8a32d
--- /dev/null
+++ b/etc/rc.d/xenodm
@@ -0,0 +1,9 @@
+#!/bin/sh
+#
+# $OpenBSD: xenodm,v 1.1 2017/02/26 16:51:18 matthieu Exp $
+
+daemon="/usr/X11R6/bin/xenodm"
+
+. /etc/rc.d/rc.subr
+
+rc_cmd $1