aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--initscripts.spec5
-rwxr-xr-xrc.d/rc.sysinit18
2 files changed, 13 insertions, 10 deletions
diff --git a/initscripts.spec b/initscripts.spec
index c6095c56..b9335003 100644
--- a/initscripts.spec
+++ b/initscripts.spec
@@ -6,7 +6,7 @@ Group: System Environment/Base
Release: 1
Source: initscripts-%{version}.tar.gz
BuildRoot: /%{_tmppath}/%{name}-%{version}-%{release}-root
-Requires: mingetty, /bin/awk, /bin/sed, mktemp, e2fsprogs >= 1.15, console-tools
+Requires: mingetty, /bin/awk, /bin/sed, mktemp, e2fsprogs >= 1.15
Requires: procps >= 2.0.6-5, sysklogd >= 1.3.31
Requires: setup >= 2.0.3, /sbin/fuser, which
Requires: modutils >= 2.3.11-5
@@ -232,6 +232,9 @@ rm -rf $RPM_BUILD_ROOT
%ghost %attr(0664,root,utmp) /var/run/utmp
%changelog
+* Sun Aug 6 2000 Bill Nottingham <notting@redhat.com>
+- add RETRYCONNECT option for ifcfg-pppX files (kenn@linux.ie)
+
* Wed Jul 26 2000 Bill Nottingham <notting@redhat.com>
- fix unclean shutdown
diff --git a/rc.d/rc.sysinit b/rc.d/rc.sysinit
index 1ad6b175..5d6fa5ff 100755
--- a/rc.d/rc.sysinit
+++ b/rc.d/rc.sysinit
@@ -98,22 +98,21 @@ esac
action "Setting clock $CLOCKDEF: `date`" date
-
-
# Load keymap
-KEYTABLE=
-KEYMAP=
-if [ -f /etc/sysconfig/console/default.kmap ]; then
+if [ -x /bin/loadkeys ]; then
+ KEYTABLE=
+ KEYMAP=
+ if [ -f /etc/sysconfig/console/default.kmap ]; then
KEYMAP=/etc/sysconfig/console/default.kmap
-else
+ else
if [ -f /etc/sysconfig/keyboard ]; then
. /etc/sysconfig/keyboard
fi
if [ -n "$KEYTABLE" -a -d "/usr/lib/kbd/keymaps" ]; then
KEYMAP=$KEYTABLE
fi
-fi
-if [ -n "$KEYMAP" ]; then
+ fi
+ if [ -n "$KEYMAP" ]; then
# Since this takes in/output from stdin/out, we can't use initlog
if [ -n "$KEYTABLE" ]; then
echo -n "Loading default keymap ($KEYTABLE): "
@@ -123,7 +122,8 @@ if [ -n "$KEYMAP" ]; then
loadkeys $KEYMAP < /dev/tty0 > /dev/tty0 2>/dev/null && \
success "Loading default keymap" || failure "Loading default keymap"
echo
-fi
+ fi
+fi
# Load system font
if [ -x /sbin/setsysfont ]; then