diff options
| author | Robert Nagy <robert@cvs.openbsd.org> | 2011-07-07 22:23:57 +0000 |
|---|---|---|
| committer | Robert Nagy <robert@cvs.openbsd.org> | 2011-07-07 22:23:57 +0000 |
| commit | 61d38903e804917aaa6f80a1a79e11ede514f776 (patch) | |
| tree | 974577d686150e1fd77a7facc99cb9315f0e373e /etc | |
| parent | da185c2cab330af9995229af05a33050a18f4556 (diff) | |
add wsmoused script and switch xdm and wsmoused in rc
Diffstat (limited to 'etc')
| -rw-r--r-- | etc/Makefile | 6 | ||||
| -rw-r--r-- | etc/rc | 11 | ||||
| -rw-r--r-- | etc/rc.d/wsmoused | 11 |
3 files changed, 16 insertions, 12 deletions
diff --git a/etc/Makefile b/etc/Makefile index fffeaf7d02e..143235c3c4e 100644 --- a/etc/Makefile +++ b/etc/Makefile @@ -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 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 \ ldapd ldattach ldpd lpd mopd mrouted named nsd ntpd portmap \ 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 \ man${OSrev}.tgz game${OSrev}.tgz etc${OSrev}.tgz @@ -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 # or after single-user. @@ -638,14 +638,7 @@ if [ X"${aucat_flags}" != X"NO" ]; then echo -n ' aucat'; aucat -l ${aucat_flags} 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 '.' exit 0 diff --git a/etc/rc.d/wsmoused b/etc/rc.d/wsmoused new file mode 100644 index 00000000000..d80598adc9f --- /dev/null +++ b/etc/rc.d/wsmoused @@ -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 |