diff options
| -rw-r--r-- | etc/Makefile | 3 | ||||
| -rw-r--r-- | etc/etc.alpha/rc.alpha | 154 | ||||
| -rw-r--r-- | etc/etc.amd64/rc.amd64 | 151 | ||||
| -rw-r--r-- | etc/etc.i386/rc.i386 | 151 | ||||
| -rw-r--r-- | etc/rc | 6 | ||||
| -rw-r--r-- | etc/rc.d/syscons | 176 | ||||
| -rw-r--r-- | etc/rc.syscons | 176 |
7 files changed, 362 insertions, 455 deletions
diff --git a/etc/Makefile b/etc/Makefile index 75da9571415e..8d2d2ead7954 100644 --- a/etc/Makefile +++ b/etc/Makefile @@ -13,7 +13,8 @@ BIN1= amd.map apmd.conf auth.conf \ printcap profile protocols \ rc rc.atm rc.devfs rc.diskless1 rc.diskless2 rc.firewall rc.firewall6 \ rc.isdn rc.network rc.network6 rc.pccard rc.serial rc.shutdown \ - rc.sysctl remote rpc security services shells syslog.conf usbd.conf \ + rc.syscons rc.sysctl remote rpc security services shells syslog.conf \ + usbd.conf \ etc.${MACHINE_ARCH}/disktab \ etc.${MACHINE_ARCH}/rc.${MACHINE_ARCH} \ etc.${MACHINE_ARCH}/ttys \ diff --git a/etc/etc.alpha/rc.alpha b/etc/etc.alpha/rc.alpha index d1252b5e6a21..cc2b3a340d63 100644 --- a/etc/etc.alpha/rc.alpha +++ b/etc/etc.alpha/rc.alpha @@ -17,158 +17,6 @@ case ${osf1_enable} in ;; esac -echo '.' - -########################################################################## -####### Syscons section ######## -########################################################################## - -# stdin must be redirected because it might be for a serial console -kbddev=/dev/ttyv0 -viddev=/dev/ttyv0 - -echo -n 'Configuring syscons:' - -# keymap -# -case ${keymap} in -[Nn][Oo] | '') - ;; -*) - echo -n ' keymap'; kbdcontrol <${kbddev} -l ${keymap} - ;; -esac - -# keyrate -# -case ${keyrate} in -[Nn][Oo] | '') - ;; -*) - echo -n ' keyrate'; kbdcontrol <${kbddev} -r ${keyrate} - ;; -esac - -# keybell -# -case ${keybell} in -[Nn][Oo] | '') - ;; -*) - echo -n ' keybell'; kbdcontrol <${kbddev} -b ${keybell} - ;; -esac - -# change function keys -# -case ${keychange} in -[Nn][Oo] | '') - ;; -*) - echo -n ' keychange' - set - ${keychange} - while [ $# -gt 0 ]; do - kbdcontrol < ${kbddev} -f "$1" "$2" - shift; shift - done - ;; -esac - -# cursor type -# -case ${cursor} in -[Nn][Oo] | '') - ;; -*) - echo -n ' cursor'; vidcontrol < ${viddev} -c ${cursor} - ;; -esac - -# screen mapping -# -case ${scrnmap} in -[Nn][Oo] | '') - ;; -*) - echo -n ' screen_map'; vidcontrol < ${viddev} -l ${scrnmap} - ;; -esac - -# font 8x16 -# -case ${font8x16} in -[Nn][Oo] | '') - ;; -*) - echo -n ' font8x16'; vidcontrol < ${viddev} -f 8x16 ${font8x16} - ;; -esac - -# font 8x14 -# -case ${font8x14} in -[Nn][Oo] | '') - ;; -*) - echo -n ' font8x14'; vidcontrol < ${viddev} -f 8x14 ${font8x14} - ;; -esac - -# font 8x8 -# -case ${font8x8} in -[Nn][Oo] | '') - ;; -*) - echo -n ' font8x8'; vidcontrol < ${viddev} -f 8x8 ${font8x8} - ;; -esac - -# blank time -# -case ${blanktime} in -[Nn][Oo] | '') - ;; -*) - echo -n ' blank_time'; vidcontrol < ${viddev} -t ${blanktime} - ;; -esac - -# screen saver -# -case ${saver} in -[Nn][Oo] | '') - ;; -*) - echo -n ' screensaver' - for i in `kldstat | awk '$5 ~ "^splash_.*$" { print $5 }'`; do - kldunload $i - done - kldstat -v | grep -q _saver || kldload ${saver}_saver - ;; -esac - -# mouse daemon -# -case ${moused_enable} in -[Yy][Ee][Ss]) - echo -n ' moused' - moused ${moused_flags} -p ${moused_port} -t ${moused_type} - vidcontrol < ${viddev} -m on - ;; -esac - -# set this mode for all virtual screens -# -if [ -n "${allscreens_flags}" ] ; then - echo -n ' allscreens' - for ttyv in /dev/ttyv*; do - vidcontrol < ${ttyv} ${allscreens_flags} - done -fi - -echo '.' - # knob for wether or not we should print out unaligned access warnings # case ${unaligned_print} in @@ -176,3 +24,5 @@ case ${unaligned_print} in sysctl -w machdep.unaligned_print=0 ;; esac + +echo '.' diff --git a/etc/etc.amd64/rc.amd64 b/etc/etc.amd64/rc.amd64 index 4f2249da2a39..d3c12ae81365 100644 --- a/etc/etc.amd64/rc.amd64 +++ b/etc/etc.amd64/rc.amd64 @@ -52,154 +52,3 @@ case ${xtend_enable} in esac echo '.' - -########################################################################## -####### Syscons section ######## -########################################################################## - -# stdin must be redirected because it might be for a serial console -# -kbddev=/dev/ttyv0 -viddev=/dev/ttyv0 - -echo -n 'Configuring syscons:' - -# keymap -# -case ${keymap} in -[Nn][Oo] | '') - ;; -*) - echo -n ' keymap'; kbdcontrol < ${kbddev} -l ${keymap} - ;; -esac - -# keyrate -# -case ${keyrate} in -[Nn][Oo] | '') - ;; -*) - echo -n ' keyrate'; kbdcontrol < ${kbddev} -r ${keyrate} - ;; -esac - -# keybell -# -case ${keybell} in -[Nn][Oo] | '') - ;; -*) - echo -n ' keybell'; kbdcontrol < ${kbddev} -b ${keybell} - ;; -esac - -# change function keys -# -case ${keychange} in -[Nn][Oo] | '') - ;; -*) - echo -n ' keychange' - set - ${keychange} - while [ $# -gt 0 ]; do - kbdcontrol <${kbddev} -f "$1" "$2" - shift; shift - done - ;; -esac - -# cursor type -# -case ${cursor} in -[Nn][Oo] | '') - ;; -*) - echo -n ' cursor'; vidcontrol < ${viddev} -c ${cursor} - ;; -esac - -# screen mapping -# -case ${scrnmap} in -[Nn][Oo] | '') - ;; -*) - echo -n ' screen_map'; vidcontrol < ${viddev} -l ${scrnmap} - ;; -esac - -# font 8x16 -# -case ${font8x16} in -[Nn][Oo] | '') - ;; -*) - echo -n ' font8x16'; vidcontrol < ${viddev} -f 8x16 ${font8x16} - ;; -esac - -# font 8x14 -# -case ${font8x14} in -[Nn][Oo] | '') - ;; -*) - echo -n ' font8x14'; vidcontrol < ${viddev} -f 8x14 ${font8x14} - ;; -esac - -# font 8x8 -# -case ${font8x8} in -[Nn][Oo] | '') - ;; -*) - echo -n ' font8x8'; vidcontrol < ${viddev} -f 8x8 ${font8x8} - ;; -esac - -# blank time -# -case ${blanktime} in -[Nn][Oo] | '') - ;; -*) - echo -n ' blank_time'; vidcontrol < ${viddev} -t ${blanktime} - ;; -esac - -# screen saver -# -case ${saver} in -[Nn][Oo] | '') - ;; -*) - echo -n ' screensaver' - for i in `kldstat | awk '$5 ~ "^splash_.*$" { print $5 }'`; do - kldunload ${i} - done - kldstat -v | grep -q _saver || kldload ${saver}_saver - ;; -esac - -# mouse daemon -# -case ${moused_enable} in -[Yy][Ee][Ss]) - echo -n ' moused' - moused ${moused_flags} -p ${moused_port} -t ${moused_type} - vidcontrol < ${viddev} -m on - ;; -esac - -# set this mode for all virtual screens -# -if [ -n "${allscreens_flags}" ]; then - echo -n ' allscreens' - for ttyv in /dev/ttyv*; do - vidcontrol ${allscreens_flags} < ${ttyv} > ${ttyv} 2>&1 - done -fi - -echo '.' diff --git a/etc/etc.i386/rc.i386 b/etc/etc.i386/rc.i386 index 4f2249da2a39..d3c12ae81365 100644 --- a/etc/etc.i386/rc.i386 +++ b/etc/etc.i386/rc.i386 @@ -52,154 +52,3 @@ case ${xtend_enable} in esac echo '.' - -########################################################################## -####### Syscons section ######## -########################################################################## - -# stdin must be redirected because it might be for a serial console -# -kbddev=/dev/ttyv0 -viddev=/dev/ttyv0 - -echo -n 'Configuring syscons:' - -# keymap -# -case ${keymap} in -[Nn][Oo] | '') - ;; -*) - echo -n ' keymap'; kbdcontrol < ${kbddev} -l ${keymap} - ;; -esac - -# keyrate -# -case ${keyrate} in -[Nn][Oo] | '') - ;; -*) - echo -n ' keyrate'; kbdcontrol < ${kbddev} -r ${keyrate} - ;; -esac - -# keybell -# -case ${keybell} in -[Nn][Oo] | '') - ;; -*) - echo -n ' keybell'; kbdcontrol < ${kbddev} -b ${keybell} - ;; -esac - -# change function keys -# -case ${keychange} in -[Nn][Oo] | '') - ;; -*) - echo -n ' keychange' - set - ${keychange} - while [ $# -gt 0 ]; do - kbdcontrol <${kbddev} -f "$1" "$2" - shift; shift - done - ;; -esac - -# cursor type -# -case ${cursor} in -[Nn][Oo] | '') - ;; -*) - echo -n ' cursor'; vidcontrol < ${viddev} -c ${cursor} - ;; -esac - -# screen mapping -# -case ${scrnmap} in -[Nn][Oo] | '') - ;; -*) - echo -n ' screen_map'; vidcontrol < ${viddev} -l ${scrnmap} - ;; -esac - -# font 8x16 -# -case ${font8x16} in -[Nn][Oo] | '') - ;; -*) - echo -n ' font8x16'; vidcontrol < ${viddev} -f 8x16 ${font8x16} - ;; -esac - -# font 8x14 -# -case ${font8x14} in -[Nn][Oo] | '') - ;; -*) - echo -n ' font8x14'; vidcontrol < ${viddev} -f 8x14 ${font8x14} - ;; -esac - -# font 8x8 -# -case ${font8x8} in -[Nn][Oo] | '') - ;; -*) - echo -n ' font8x8'; vidcontrol < ${viddev} -f 8x8 ${font8x8} - ;; -esac - -# blank time -# -case ${blanktime} in -[Nn][Oo] | '') - ;; -*) - echo -n ' blank_time'; vidcontrol < ${viddev} -t ${blanktime} - ;; -esac - -# screen saver -# -case ${saver} in -[Nn][Oo] | '') - ;; -*) - echo -n ' screensaver' - for i in `kldstat | awk '$5 ~ "^splash_.*$" { print $5 }'`; do - kldunload ${i} - done - kldstat -v | grep -q _saver || kldload ${saver}_saver - ;; -esac - -# mouse daemon -# -case ${moused_enable} in -[Yy][Ee][Ss]) - echo -n ' moused' - moused ${moused_flags} -p ${moused_port} -t ${moused_type} - vidcontrol < ${viddev} -m on - ;; -esac - -# set this mode for all virtual screens -# -if [ -n "${allscreens_flags}" ]; then - echo -n ' allscreens' - for ttyv in /dev/ttyv*; do - vidcontrol ${allscreens_flags} < ${ttyv} > ${ttyv} 2>&1 - done -fi - -echo '.' @@ -635,6 +635,12 @@ if [ -r /etc/rc.${arch} ]; then . /etc/rc.${arch} fi +# Configure the system console +# +if [ -r /etc/rc.syscons ]; then + . /etc/rc.syscons +fi + # Run rc.devfs if readable to customize devfs # if [ -r /etc/rc.devfs ]; then diff --git a/etc/rc.d/syscons b/etc/rc.d/syscons new file mode 100644 index 000000000000..4fd663ea1126 --- /dev/null +++ b/etc/rc.d/syscons @@ -0,0 +1,176 @@ +#!/bin/sh - +# +# Copyright (c) 2000 The FreeBSD Project +# All rights reserved. +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# 1. Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# 2. Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in the +# documentation and/or other materials provided with the distribution. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND +# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +# ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE +# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS +# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) +# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT +# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY +# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF +# SUCH DAMAGE. +# +# $FreeBSD$ +# Do syscons configuration +# + +# stdin must be redirected because it might be for a serial console +# +kbddev=/dev/ttyv0 +viddev=/dev/ttyv0 + +echo -n 'Configuring syscons:' + +# keymap +# +case ${keymap} in +[Nn][Oo] | '') + ;; +*) + echo -n ' keymap'; kbdcontrol < ${kbddev} -l ${keymap} + ;; +esac + +# keyrate +# +case ${keyrate} in +[Nn][Oo] | '') + ;; +*) + echo -n ' keyrate'; kbdcontrol < ${kbddev} -r ${keyrate} + ;; +esac + +# keybell +# +case ${keybell} in +[Nn][Oo] | '') + ;; +*) + echo -n ' keybell'; kbdcontrol < ${kbddev} -b ${keybell} + ;; +esac + +# change function keys +# +case ${keychange} in +[Nn][Oo] | '') + ;; +*) + echo -n ' keychange' + set - ${keychange} + while [ $# -gt 0 ]; do + kbdcontrol <${kbddev} -f "$1" "$2" + shift; shift + done + ;; +esac + +# cursor type +# +case ${cursor} in +[Nn][Oo] | '') + ;; +*) + echo -n ' cursor'; vidcontrol < ${viddev} -c ${cursor} + ;; +esac + +# screen mapping +# +case ${scrnmap} in +[Nn][Oo] | '') + ;; +*) + echo -n ' screen_map'; vidcontrol < ${viddev} -l ${scrnmap} + ;; +esac + +# font 8x16 +# +case ${font8x16} in +[Nn][Oo] | '') + ;; +*) + echo -n ' font8x16'; vidcontrol < ${viddev} -f 8x16 ${font8x16} + ;; +esac + +# font 8x14 +# +case ${font8x14} in +[Nn][Oo] | '') + ;; +*) + echo -n ' font8x14'; vidcontrol < ${viddev} -f 8x14 ${font8x14} + ;; +esac + +# font 8x8 +# +case ${font8x8} in +[Nn][Oo] | '') + ;; +*) + echo -n ' font8x8'; vidcontrol < ${viddev} -f 8x8 ${font8x8} + ;; +esac + +# blank time +# +case ${blanktime} in +[Nn][Oo] | '') + ;; +*) + echo -n ' blank_time'; vidcontrol < ${viddev} -t ${blanktime} + ;; +esac + +# screen saver +# +case ${saver} in +[Nn][Oo] | '') + ;; +*) + echo -n ' screensaver' + for i in `kldstat | awk '$5 ~ "^splash_.*$" { print $5 }'`; do + kldunload ${i} + done + kldstat -v | grep -q _saver || kldload ${saver}_saver + ;; +esac + +# mouse daemon +# +case ${moused_enable} in +[Yy][Ee][Ss]) + echo -n ' moused' + moused ${moused_flags} -p ${moused_port} -t ${moused_type} + vidcontrol < ${viddev} -m on + ;; +esac + +# set this mode for all virtual screens +# +if [ -n "${allscreens_flags}" ]; then + echo -n ' allscreens' + for ttyv in /dev/ttyv*; do + vidcontrol ${allscreens_flags} < ${ttyv} > ${ttyv} 2>&1 + done +fi + +echo '.' diff --git a/etc/rc.syscons b/etc/rc.syscons new file mode 100644 index 000000000000..4fd663ea1126 --- /dev/null +++ b/etc/rc.syscons @@ -0,0 +1,176 @@ +#!/bin/sh - +# +# Copyright (c) 2000 The FreeBSD Project +# All rights reserved. +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# 1. Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# 2. Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in the +# documentation and/or other materials provided with the distribution. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND +# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +# ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE +# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS +# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) +# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT +# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY +# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF +# SUCH DAMAGE. +# +# $FreeBSD$ +# Do syscons configuration +# + +# stdin must be redirected because it might be for a serial console +# +kbddev=/dev/ttyv0 +viddev=/dev/ttyv0 + +echo -n 'Configuring syscons:' + +# keymap +# +case ${keymap} in +[Nn][Oo] | '') + ;; +*) + echo -n ' keymap'; kbdcontrol < ${kbddev} -l ${keymap} + ;; +esac + +# keyrate +# +case ${keyrate} in +[Nn][Oo] | '') + ;; +*) + echo -n ' keyrate'; kbdcontrol < ${kbddev} -r ${keyrate} + ;; +esac + +# keybell +# +case ${keybell} in +[Nn][Oo] | '') + ;; +*) + echo -n ' keybell'; kbdcontrol < ${kbddev} -b ${keybell} + ;; +esac + +# change function keys +# +case ${keychange} in +[Nn][Oo] | '') + ;; +*) + echo -n ' keychange' + set - ${keychange} + while [ $# -gt 0 ]; do + kbdcontrol <${kbddev} -f "$1" "$2" + shift; shift + done + ;; +esac + +# cursor type +# +case ${cursor} in +[Nn][Oo] | '') + ;; +*) + echo -n ' cursor'; vidcontrol < ${viddev} -c ${cursor} + ;; +esac + +# screen mapping +# +case ${scrnmap} in +[Nn][Oo] | '') + ;; +*) + echo -n ' screen_map'; vidcontrol < ${viddev} -l ${scrnmap} + ;; +esac + +# font 8x16 +# +case ${font8x16} in +[Nn][Oo] | '') + ;; +*) + echo -n ' font8x16'; vidcontrol < ${viddev} -f 8x16 ${font8x16} + ;; +esac + +# font 8x14 +# +case ${font8x14} in +[Nn][Oo] | '') + ;; +*) + echo -n ' font8x14'; vidcontrol < ${viddev} -f 8x14 ${font8x14} + ;; +esac + +# font 8x8 +# +case ${font8x8} in +[Nn][Oo] | '') + ;; +*) + echo -n ' font8x8'; vidcontrol < ${viddev} -f 8x8 ${font8x8} + ;; +esac + +# blank time +# +case ${blanktime} in +[Nn][Oo] | '') + ;; +*) + echo -n ' blank_time'; vidcontrol < ${viddev} -t ${blanktime} + ;; +esac + +# screen saver +# +case ${saver} in +[Nn][Oo] | '') + ;; +*) + echo -n ' screensaver' + for i in `kldstat | awk '$5 ~ "^splash_.*$" { print $5 }'`; do + kldunload ${i} + done + kldstat -v | grep -q _saver || kldload ${saver}_saver + ;; +esac + +# mouse daemon +# +case ${moused_enable} in +[Yy][Ee][Ss]) + echo -n ' moused' + moused ${moused_flags} -p ${moused_port} -t ${moused_type} + vidcontrol < ${viddev} -m on + ;; +esac + +# set this mode for all virtual screens +# +if [ -n "${allscreens_flags}" ]; then + echo -n ' allscreens' + for ttyv in /dev/ttyv*; do + vidcontrol ${allscreens_flags} < ${ttyv} > ${ttyv} 2>&1 + done +fi + +echo '.' |