aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--initscripts.spec2
-rwxr-xr-xrc.d/rc.sysinit8
-rwxr-xr-xsetsysfont4
-rwxr-xr-xsysconfig/network-scripts/ifup-ppp2
4 files changed, 11 insertions, 5 deletions
diff --git a/initscripts.spec b/initscripts.spec
index d0cef8ae..ea2ac97a 100644
--- a/initscripts.spec
+++ b/initscripts.spec
@@ -7,7 +7,7 @@ Group: Base
Release: 1
Source: initscripts-%{version}.tar.gz
BuildRoot: /var/tmp/initbld
-Requires: mingetty, bash, mktemp, modutils >= 2.1.85-3, e2fsprogs
+Requires: mingetty, bash, mktemp, modutils >= 2.1.85-3, e2fsprogs, kbd
Conflicts: redhat-release <= 5.1
Prereq: /sbin/chkconfig
diff --git a/rc.d/rc.sysinit b/rc.d/rc.sysinit
index 0b84f72f..af93e42b 100755
--- a/rc.d/rc.sysinit
+++ b/rc.d/rc.sysinit
@@ -44,6 +44,10 @@ if [ -f /fsckoptions ]; then
fsckoptions=''
fi
+if [ -f /forcefsck ]; then
+ fsckoptions='-f $fsckoptions'
+fi
+
if [ ! -f /fastboot ]; then
action -n "Checking root filesystem" fsck -T -a $fsckoptions /
rc=$?
@@ -119,6 +123,7 @@ fi
# Set up kernel version-dependent symlinks.
rm -f /lib/modules/preferred
+
if [ -n "$USEMODULES" ]; then
ktag="`cat /proc/version`"
mtag=`grep -l "$ktag" /lib/modules/*/.rhkmvtag` 2> /dev/null
@@ -233,7 +238,7 @@ if [ -x /sbin/quotaon ]; then
fi
# Clean out /etc.
-rm -f /etc/mtab~ /fastboot /fsckoptions
+rm -f /etc/mtab~ /fastboot /fsckoptions /forcefsck
>/var/run/utmp
# Delete UUCP lock files.
@@ -273,6 +278,7 @@ CLOCKDEF=""
if [ -x /sbin/hwclock ]; then
CLOCKFLAGS="--hctosys"
CLOCK=/sbin/hwclock
+ $CLOCK --adjust
else
CLOCKFLAGS="-a"
CLOCK=/sbin/clock
diff --git a/setsysfont b/setsysfont
index 1105a087..2cff7a0c 100755
--- a/setsysfont
+++ b/setsysfont
@@ -10,8 +10,8 @@ if [ -x /usr/bin/setfont ]; then
/usr/bin/setfont $SYSFONT -u $UNIMAP
elif [ -n "$SYSFONT" ]; then
/usr/bin/setfont $SYSFONT
- else
- /usr/bin/setfont
+# else
+# /usr/bin/setfont
fi
else
diff --git a/sysconfig/network-scripts/ifup-ppp b/sysconfig/network-scripts/ifup-ppp
index de891438..ef3ec4bd 100755
--- a/sysconfig/network-scripts/ifup-ppp
+++ b/sysconfig/network-scripts/ifup-ppp
@@ -6,7 +6,7 @@ PATH=/sbin:/usr/sbin:/bin:/usr/bin
if [ "$1" != daemon ] ; then
# disconnect stdin, out, err to disassociate from controlling tty
# so that no HUPs will get through.
- $0 daemon $*& </dev/null >/dev/null 2>/dev/null
+ $0 daemon $* </dev/null >/dev/null 2>/dev/null &
exit 0
fi
shift