Browse Source

Switch to xenodm(1).

Do it now deraadt@
OPENBSD_6_1
matthieu 7 years ago
parent
commit
0d0442ff01
6 changed files with 17 additions and 17 deletions
  1. +2
    -2
      src/etc/Makefile
  2. +2
    -2
      src/etc/mtree/BSD.x11.dist
  3. +2
    -2
      src/etc/rc
  4. +2
    -2
      src/etc/rc.conf
  5. +0
    -9
      src/etc/rc.d/xdm
  6. +9
    -0
      src/etc/rc.d/xenodm

+ 2
- 2
src/etc/Makefile View File

@ -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


+ 2
- 2
src/etc/mtree/BSD.x11.dist View File

@ -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
..
..


+ 2
- 2
src/etc/rc View File

@ -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


+ 2
- 2
src/etc/rc.conf View File

@ -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


+ 0
- 9
src/etc/rc.d/xdm View File

@ -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

+ 9
- 0
src/etc/rc.d/xenodm View File

@ -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

Loading…
Cancel
Save