aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog12
-rw-r--r--initscripts.spec9
-rwxr-xr-xlang.csh6
-rwxr-xr-xlang.sh2
-rwxr-xr-xrc.d/rc.sysinit2
-rwxr-xr-xsetsysfont4
6 files changed, 25 insertions, 10 deletions
diff --git a/ChangeLog b/ChangeLog
index abcd35f8..7bbe8f19 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2003-03-13 Bill Nottingham <notting@redhat.com>
+
+ * ChangeLog, initscripts.spec:
+ 7.14-1
+
+ * sysconfig/network-scripts/ifup, sysconfig/network-scripts/ifup-post:
+ revert. chain name change was reverted.
+
+2003-02-28 Bill Nottingham <notting@redhat.com>
+
+ * service: pass TERM to scripts too
+
2003-02-26 Bill Nottingham <notting@redhat.com>
* ChangeLog, initscripts.spec:
diff --git a/initscripts.spec b/initscripts.spec
index 2dc3fb4e..13940825 100644
--- a/initscripts.spec
+++ b/initscripts.spec
@@ -1,6 +1,6 @@
Summary: The inittab file and the /etc/init.d scripts.
Name: initscripts
-Version: 7.13
+Version: 7.15
License: GPL
Group: System Environment/Base
Release: 1
@@ -246,10 +246,17 @@ rm -rf $RPM_BUILD_ROOT
%ghost %attr(0664,root,utmp) /var/run/utmp
%changelog
+* Thu Apr 03 2003 Karsten Hopp <karsten@redhat.de> 7.15-1
+- Mainframe has no /dev/ttyX devices and no mingetty, don't
+ initialize them. This gave error messages during startup
+
* Mon Mar 17 2003 Nalin Dahyabhai <nalin@redhat.com>
- init.d/network: don't advertise "probe: true" in the header if we don't
recognize "probe" as an argument
+* Wed Mar 12 2003 Bill Nottingham <notting@redhat.com> 7.14-1
+* - do not handle changed chain name; change was reverted
+
* Tue Feb 25 2003 Bill Nottingham <notting@redhat.com> 7.13-1
- handle 7.x SYSFONTACM settings in setsysfont (#84183)
diff --git a/lang.csh b/lang.csh
index b119ca51..dfc4bad5 100755
--- a/lang.csh
+++ b/lang.csh
@@ -74,12 +74,10 @@ if ($sourced == 1) then
if ( $?TERM ) then
if ( "$TERM" == "linux" ) then
if ( `/sbin/consoletype` == "vt" ) then
- if ( -x /bin/unicode_start ) then
- if ( $?SYSFONTACM ) then
+ if ( $?SYSFONTACM ) then
unicode_start $SYSFONT $SYSFONTACM
- else
+ else
unicode_start $SYSFONT
- endif
endif
endif
endif
diff --git a/lang.sh b/lang.sh
index dd16e59d..534d465c 100755
--- a/lang.sh
+++ b/lang.sh
@@ -70,7 +70,7 @@ if [ "$sourced" = 1 ]; then
case $LANG in
*.utf8*|*.UTF-8*)
if [ "$TERM" = "linux" -a "`/sbin/consoletype`" = "vt" ]; then
- [ -x /bin/unicode_start ] && unicode_start $SYSFONT $SYSFONTACM
+ unicode_start $SYSFONT $SYSFONTACM
fi
;;
esac
diff --git a/rc.d/rc.sysinit b/rc.d/rc.sysinit
index 5005b24e..8f89960f 100755
--- a/rc.d/rc.sysinit
+++ b/rc.d/rc.sysinit
@@ -359,7 +359,7 @@ if [ -n "$IN_INITLOG" ]; then
IN_INITLOG=
fi
-if ! LC_ALL=C grep -iq nomodules /proc/cmdline 2>/dev/null && [ -f /proc/modules ]; then
+if ! LC_ALL=C grep -iq nomodules /proc/cmdline 2>/dev/null && [ -f /proc/ksyms ]; then
USEMODULES=y
fi
diff --git a/setsysfont b/setsysfont
index 70e8c6aa..7e44a9a8 100755
--- a/setsysfont
+++ b/setsysfont
@@ -8,9 +8,7 @@ fi
case "$LANG" in
*.utf8|*.UTF-8)
- if [ -x /bin/unicode_start ]; then
- exec unicode_start $SYSFONT $SYSFONTACM
- fi
+ exec unicode_start $SYSFONT $SYSFONTACM
;;
esac