aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBill Nottingham <notting@redhat.com>2005-06-06 17:13:10 +0000
committerBill Nottingham <notting@redhat.com>2005-06-06 17:13:10 +0000
commit50afc38da9b721939b2d66c4b61c8de742350e81 (patch)
tree6db394e8ebafa918fad54f36d279c2f4905da1e6
parent1145379bb93c8d116f04fdd39824296092cc7d4a (diff)
downloadinitscripts-50afc38da9b721939b2d66c4b61c8de742350e81.tar
initscripts-50afc38da9b721939b2d66c4b61c8de742350e81.tar.gz
initscripts-50afc38da9b721939b2d66c4b61c8de742350e81.tar.bz2
initscripts-50afc38da9b721939b2d66c4b61c8de742350e81.tar.xz
initscripts-50afc38da9b721939b2d66c4b61c8de742350e81.zip
A fix for the font-not-initialized-on-secondary-consoles was
merged in 2.6.11-rc4. Remove workaround, add dep.
-rw-r--r--initscripts.spec2
-rwxr-xr-xrc.d/rc.sysinit14
2 files changed, 1 insertions, 15 deletions
diff --git a/initscripts.spec b/initscripts.spec
index 24e0e06d..aa88acf8 100644
--- a/initscripts.spec
+++ b/initscripts.spec
@@ -16,7 +16,7 @@ Requires: util-linux >= 2.10s-11, mount >= 2.11l
Requires: bash >= 3.0, SysVinit >= 2.85-38
Requires: /sbin/ip, /sbin/arping, net-tools
Requires: /etc/redhat-release, dev
-Requires: ethtool >= 1.8-2, kernel >= 2.6, /sbin/nash, /sbin/runuser
+Requires: ethtool >= 1.8-2, kernel >= 2.6.11, /sbin/nash, /sbin/runuser
Conflicts: mkinitrd < 4.0
Conflicts: ypbind < 1.6-12, psacct < 6.3.2-12, kbd < 1.06-19, lokkit < 0.50-14
Conflicts: udev < 0:048
diff --git a/rc.d/rc.sysinit b/rc.d/rc.sysinit
index 886452b7..4bf820d4 100755
--- a/rc.d/rc.sysinit
+++ b/rc.d/rc.sysinit
@@ -70,20 +70,6 @@ relabel_selinux() {
fi
}
-
-
-if [ "$HOSTTYPE" != "s390" -a "$HOSTTYPE" != "s390x" ]; then
- last=0
- for i in `LC_ALL=C grep '^[0-9].*respawn:/sbin/mingetty' /etc/inittab | sed 's/^.* tty\([0-9][0-9]*\).*/\1/g'`; do
- > /dev/tty$i
- last=$i
- done
- if [ $last -gt 0 ]; then
- > /dev/tty$((last+1))
- > /dev/tty$((last+2))
- fi
-fi
-
if [ "$CONSOLETYPE" = "vt" -a -x /sbin/setsysfont ]; then
echo -n "Setting default font ($SYSFONT): "
/sbin/setsysfont