diff options
| author | Jeff Johnson <jbj@redhat.com> | 1998-06-21 21:12:48 +0000 |
|---|---|---|
| committer | Jeff Johnson <jbj@redhat.com> | 1998-06-21 21:12:48 +0000 |
| commit | 08d59fa7913d46b8d1a52499b5c1a7983e635bc7 (patch) | |
| tree | 4ad188e964ecb8d11ded900c45d30538b92070e8 /rc.d | |
| parent | f0544294be49dfabb0e18bd514a2f25375f15c67 (diff) | |
| download | initscripts-08d59fa7913d46b8d1a52499b5c1a7983e635bc7.tar initscripts-08d59fa7913d46b8d1a52499b5c1a7983e635bc7.tar.gz initscripts-08d59fa7913d46b8d1a52499b5c1a7983e635bc7.tar.bz2 initscripts-08d59fa7913d46b8d1a52499b5c1a7983e635bc7.tar.xz initscripts-08d59fa7913d46b8d1a52499b5c1a7983e635bc7.zip | |
Fix bug track problems (#677, #731, #734, E-mail).
Diffstat (limited to 'rc.d')
| -rwxr-xr-x | rc.d/init.d/network | 2 | ||||
| -rwxr-xr-x | rc.d/rc.sysinit | 34 |
2 files changed, 28 insertions, 8 deletions
diff --git a/rc.d/init.d/network b/rc.d/init.d/network index 4d0c764b..3bb2afd5 100755 --- a/rc.d/init.d/network +++ b/rc.d/init.d/network @@ -2,7 +2,7 @@ # # network Bring up/down networking # -# chkconfig: 345 10 97 +# chkconfig: 2345 10 97 # description: Activates/Deactivates all network interfaces configured to \ # start at boot time. # probe: true diff --git a/rc.d/rc.sysinit b/rc.d/rc.sysinit index e53253cf..fc846522 100755 --- a/rc.d/rc.sysinit +++ b/rc.d/rc.sysinit @@ -52,7 +52,7 @@ if [ ! -f /fastboot ]; then echo "*** Dropping you to a shell; the system will reboot" echo "*** when you leave the shell." - PS1="(Repair filesystem) #"; export PS1 + PS1="(Repair filesystem) \#"; export PS1 sulogin echo "Unmounting file systems" @@ -119,6 +119,20 @@ if [ -n $USEMODULES ]; then if echo $1 | grep '^BOOT_IMAGE=' > /dev/null ; then image=`echo $1 | awk -F= '{ print $2 }'` kernelfile=`/sbin/lilo -I $image` + firstkernelfile=`/sbin/lilo -I $image` + kernelfile="$firstkernelfile" + # Traverse symbolic links + while [ -L "$kernelfile" ]; do + newkernelfile="`ls -l $kernelfile | awk '-F-> ' '{print $2}'`" + if [ "${newkernelfile#/}" != "$newkernelfile" ]; then + # newkernelfile is an absolut path + kernelfile=$newkernelfile + else + kernelfile="${kernelfile%$(basename $kernelfile)}$newkernelfile" + fi + # Check if we're looping + [ "$kernelfile" = "$firstkernelfile" ] && break + done elif echo $1 | grep '^bootfile=' > /dev/null ; then kernelfile=`echo $1 | awk -F= '{ print $2 }'` fi @@ -136,7 +150,7 @@ if [ -n $USEMODULES ]; then fi fi -if [ -x /sbin/depmod -a -n "$USEMODULES" ]; then +if [ -x /sbin/depmod -a -n "$USEMODULES" -a ! -f /proc/sys/kernel/modprobe ]; then # Get ready for kerneld if module support in the kernel echo -n "Finding module dependencies... " if [ -e /lib/modules/preferred ]; then @@ -182,7 +196,7 @@ if [ ! -f /fastboot ]; then echo "*** Dropping you to a shell; the system will reboot" echo "*** when you leave the shell." - PS1="(Repair filesystem) #"; export PS1 + PS1="(Repair filesystem) \#"; export PS1 sulogin echo "Unmounting file systems" @@ -256,14 +270,20 @@ else CLOCK=/sbin/clock fi -if [ $UTC = "true" ]; then +case "$UTC" in + yes|true) CLOCKFLAGS="$CLOCKFLAGS -u"; echo -n " (utc)" -fi -if [ $ARC = "true" ]; then + ;; +esac + +case "$ARC" in + yes|true) CLOCKFLAGS="$CLOCKFLAGS -A"; echo -n " (arc)" -fi + ;; +esac + echo -n ": " $CLOCK $CLOCKFLAGS |