Browse Source

add wsmoused script and switch xdm and wsmoused in rc

OPENBSD_5_0
robert 13 years ago
parent
commit
668b904707
3 changed files with 16 additions and 12 deletions
  1. +3
    -3
      src/etc/Makefile
  2. +2
    -9
      src/etc/rc
  3. +11
    -0
      src/etc/rc.d/wsmoused

+ 3
- 3
src/etc/Makefile View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.300 2011/07/07 21:00:59 deraadt Exp $
# $OpenBSD: Makefile,v 1.301 2011/07/07 22:23:56 robert Exp $
TZDIR= /usr/share/zoneinfo TZDIR= /usr/share/zoneinfo
LOCALTIME= Canada/Mountain LOCALTIME= Canada/Mountain
@ -35,8 +35,8 @@ RCDAEMONS= apmd bgpd bootparamd cron dhcpd dhcrelay dvmrpd ftpd ftpproxy \
hostapd hotplugd httpd identd ifstated iked inetd isakmpd \ hostapd hotplugd httpd identd ifstated iked inetd isakmpd \
ldapd ldattach ldpd lpd mopd mrouted named nsd ntpd portmap \ ldapd ldattach ldpd lpd mopd mrouted named nsd ntpd portmap \
rarpd rbootd relayd ripd route6d rtadvd rtsold rwhod sasyncd \ rarpd rbootd relayd ripd route6d rtadvd rtsold rwhod sasyncd \
sendmail sensorsd smtpd snmpd sshd syslogd watchdogd ypbind \
ypldap yppasswdd ypserv
sendmail sensorsd smtpd snmpd sshd syslogd watchdogd wsmoused \
xdm ypbind ypldap yppasswdd ypserv
MISETS= base${OSrev}.tgz comp${OSrev}.tgz \ MISETS= base${OSrev}.tgz comp${OSrev}.tgz \
man${OSrev}.tgz game${OSrev}.tgz etc${OSrev}.tgz man${OSrev}.tgz game${OSrev}.tgz etc${OSrev}.tgz


+ 2
- 9
src/etc/rc View File

@ -1,4 +1,4 @@
# $OpenBSD: rc,v 1.358 2011/07/07 21:00:59 deraadt Exp $
# $OpenBSD: rc,v 1.359 2011/07/07 22:23:56 robert Exp $
# System startup script run by init on autoboot # System startup script run by init on autoboot
# or after single-user. # or after single-user.
@ -638,14 +638,7 @@ if [ X"${aucat_flags}" != X"NO" ]; then
echo -n ' aucat'; aucat -l ${aucat_flags} echo -n ' aucat'; aucat -l ${aucat_flags}
fi fi
if [ X"${wsmoused_flags}" != X"NO" -a -x /usr/sbin/wsmoused ]; then
echo -n ' wsmoused'; wsmoused ${wsmoused_flags}
fi
# Alternatively, on some architectures, xdm may be started in /etc/ttys.
if [ X"${xdm_flags}" != X"NO" -a -x /usr/X11R6/bin/xdm ]; then
echo -n ' xdm'; /usr/X11R6/bin/xdm ${xdm_flags}
fi
start_daemon wsmoused xdm
echo '.' echo '.'
exit 0 exit 0

+ 11
- 0
src/etc/rc.d/wsmoused View File

@ -0,0 +1,11 @@
#!/bin/sh
#
# $OpenBSD: wsmoused,v 1.1 2011/07/07 22:23:56 robert Exp $
daemon="/usr/sbin/wsmoused"
. /etc/rc.d/rc.subr
rc_reload=NO
rc_cmd $1

Loading…
Cancel
Save