=================================================================== RCS file: /cvsrepo/anoncvs/cvs/src/etc/rc,v retrieving revision 1.356 retrieving revision 1.357 diff -c -r1.356 -r1.357 *** src/etc/rc 2011/07/07 18:40:00 1.356 --- src/etc/rc 2011/07/07 20:54:05 1.357 *************** *** 1,4 **** ! # $OpenBSD: rc,v 1.356 2011/07/07 18:40:00 deraadt Exp $ # System startup script run by init on autoboot # or after single-user. --- 1,4 ---- ! # $OpenBSD: rc,v 1.357 2011/07/07 20:54:05 deraadt Exp $ # System startup script run by init on autoboot # or after single-user. *************** *** 596,607 **** echo '.' - mixerctl_conf - - if [ X"${aucat_flags}" != X"NO" ]; then - aucat -l ${aucat_flags} - fi - if [ X"${kdc_flags}" != X"NO" ]; then echo -n 'starting KerberosV daemons:' start_daemon kdc kadmind kpasswdd --- 596,601 ---- *************** *** 637,649 **** date if [ X"${wsmoused_flags}" != X"NO" -a -x /usr/sbin/wsmoused ]; then ! echo 'starting 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 'starting xdm...'; /usr/X11R6/bin/xdm ${xdm_flags} fi exit 0 --- 631,651 ---- date + mixerctl_conf + echo -n 'starting console services:' + + 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 + echo '.' exit 0