aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--initscripts-s390.patch2
-rw-r--r--initscripts.spec1
-rwxr-xr-xrc.d/rc.sysinit4
3 files changed, 4 insertions, 3 deletions
diff --git a/initscripts-s390.patch b/initscripts-s390.patch
index e9a46146..d09f92ca 100644
--- a/initscripts-s390.patch
+++ b/initscripts-s390.patch
@@ -20,5 +20,5 @@
+# System date on S390 is always set correctly
+action $"System date: `date` " date
- if [ "`/sbin/consoletype`" = "vt" ]; then
+ if [ "$CONSOLETYPE" = "vt" ]; then
# Load keymap
diff --git a/initscripts.spec b/initscripts.spec
index a1819096..f3ed6a67 100644
--- a/initscripts.spec
+++ b/initscripts.spec
@@ -249,6 +249,7 @@ rm -rf $RPM_BUILD_ROOT
* Mon Apr 21 2003 Florian La Roche <Florian.LaRoche@redhat.de>
- initscripts-s390.patch: remove not needed parts about PNP=
- inittab.390: sync with normal version
+- rc.sysinit: remove two further calls to /sbin/consoletype with $CONSOLETYPE
* Fri Apr 18 2003 Florian La Roche <Florian.LaRoche@redhat.de>
- sysconfig/init.s390: set LOGLEVEL=3 as for other archs
diff --git a/rc.d/rc.sysinit b/rc.d/rc.sysinit
index dbbaa43b..49aabc7c 100755
--- a/rc.d/rc.sysinit
+++ b/rc.d/rc.sysinit
@@ -44,7 +44,7 @@ if [ "$HOSTTYPE" != "s390" -a "$HOSTTYPE" != "s390x" ]; then
fi
fi
-if [ "`/sbin/consoletype`" = "vt" -a -x /sbin/setsysfont ]; then
+if [ "$CONSOLETYPE" = "vt" -a -x /sbin/setsysfont ]; then
echo -n "Setting default font ($SYSFONT): "
/sbin/setsysfont
if [ $? -eq 0 ]; then
@@ -130,7 +130,7 @@ esac
action $"Setting clock $CLOCKDEF: `date`" date
-if [ "`/sbin/consoletype`" = "vt" -a -x /bin/loadkeys ]; then
+if [ "$CONSOLETYPE" = "vt" -a -x /bin/loadkeys ]; then
KEYTABLE=
KEYMAP=
if [ -f /etc/sysconfig/console/default.kmap ]; then