diff options
| author | David Kaspar [Dee'Kej] <dkaspar@redhat.com> | 2018-05-24 16:00:22 +0200 |
|---|---|---|
| committer | David Kaspar [Dee'Kej] <dkaspar@redhat.com> | 2018-05-30 14:33:04 +0200 |
| commit | f88dbd98e992635ee569fb6349f49cb6d215c434 (patch) | |
| tree | 8cf8850e7c78a7bded50b735843e5e9f2335c77b /etc/rc.d | |
| parent | 59928ce72da10f1c45a0aa08c9dd3a439fdd74a0 (diff) | |
| download | initscripts-f88dbd98e992635ee569fb6349f49cb6d215c434.tar initscripts-f88dbd98e992635ee569fb6349f49cb6d215c434.tar.gz initscripts-f88dbd98e992635ee569fb6349f49cb6d215c434.tar.bz2 initscripts-f88dbd98e992635ee569fb6349f49cb6d215c434.tar.xz initscripts-f88dbd98e992635ee569fb6349f49cb6d215c434.zip | |
lang.{sh,csh} moved into setup package
Other references to these files were removed, as well as irrelevant
info in sysconfig.txt, and some dead code in init.d/functions file.
Diffstat (limited to 'etc/rc.d')
| -rw-r--r-- | etc/rc.d/init.d/functions | 19 |
1 files changed, 3 insertions, 16 deletions
diff --git a/etc/rc.d/init.d/functions b/etc/rc.d/init.d/functions index a8174751..dd6a3165 100644 --- a/etc/rc.d/init.d/functions +++ b/etc/rc.d/init.d/functions @@ -58,21 +58,6 @@ systemctl_redirect () { # Get a sane screen width [ -z "${COLUMNS:-}" ] && COLUMNS=80 -if [ -z "${CONSOLETYPE:-}" ]; then - if [ -c "/dev/stderr" ] && [ -r "/dev/stderr" ]; then - CONSOLETYPE="$(/sbin/consoletype < /dev/stderr 2>/dev/null)" - else - CONSOLETYPE="serial" - fi -fi - -if [ -z "${NOLOCALE:-}" ] && [ -z "${LANGSH_SOURCED:-}" ] && \ - [ -f /etc/sysconfig/i18n -o -f /etc/locale.conf ] ; then - . /etc/profile.d/lang.sh 2>/dev/null - # avoid propagating LANGSH_SOURCED any further - unset LANGSH_SOURCED -fi - # Read in our configuration if [ -z "${BOOTUP:-}" ]; then if [ -f /etc/sysconfig/init ]; then @@ -98,7 +83,9 @@ if [ -z "${BOOTUP:-}" ]; then # Verbosity of logging: LOGLEVEL=1 fi - if [ "$CONSOLETYPE" = "serial" ]; then + + # NOTE: /dev/ttyS* is serial console. + if tty | grep --quiet -e '/dev/ttyS'; then BOOTUP=serial MOVE_TO_COL= SETCOLOR_SUCCESS= |