From 4a2d437732d15ab86247a43cb246e122cc09414b Mon Sep 17 00:00:00 2001 From: "Jordan K. Hubbard" Date: Mon, 28 Apr 1997 05:51:57 +0000 Subject: [PATCH] YAMF22 --- etc/etc.amd64/rc.amd64 | 15 ++++++++++----- etc/etc.i386/rc.i386 | 15 ++++++++++----- etc/rc.d/pccard | 5 ----- etc/rc.pccard | 5 ----- 4 files changed, 20 insertions(+), 20 deletions(-) diff --git a/etc/etc.amd64/rc.amd64 b/etc/etc.amd64/rc.amd64 index f7939b6cf00a..17b4de18700b 100644 --- a/etc/etc.amd64/rc.amd64 +++ b/etc/etc.amd64/rc.amd64 @@ -1,10 +1,15 @@ #!/bin/sh - # -# $Id: rc.i386,v 1.21 1997/02/23 09:21:03 peter Exp $ +# $Id: rc.i386,v 1.22 1997/04/27 03:59:19 jkh Exp $ # Do i386 specific processing # echo -n 'Initial rc.i386 initialization:' +if [ "X$apm_enable" = X"YES" ] ; then + echo -n ' apm' + apmconf -e > /dev/null 2>&1 +fi + # Start the SCO binary emulation if requested. if [ "X${ibcs2_enable}" = X"YES" ]; then echo -n ' ibcs2'; ibcs2 > /dev/null 2>&1 @@ -102,9 +107,9 @@ echo '.' # interrupts for /dev/random device if [ "X${rand_irqs}" != X"NO" ] ; then - echo -n 'entropy source: ' - rndcontrol ${rand_irqs} + echo -n 'entropy IRQs:' + for irq in ${rand_irqs}; do + echo -n " ${irq}" && rndcontrol -q -s ${irq} + done echo '.' fi - - diff --git a/etc/etc.i386/rc.i386 b/etc/etc.i386/rc.i386 index f7939b6cf00a..17b4de18700b 100644 --- a/etc/etc.i386/rc.i386 +++ b/etc/etc.i386/rc.i386 @@ -1,10 +1,15 @@ #!/bin/sh - # -# $Id: rc.i386,v 1.21 1997/02/23 09:21:03 peter Exp $ +# $Id: rc.i386,v 1.22 1997/04/27 03:59:19 jkh Exp $ # Do i386 specific processing # echo -n 'Initial rc.i386 initialization:' +if [ "X$apm_enable" = X"YES" ] ; then + echo -n ' apm' + apmconf -e > /dev/null 2>&1 +fi + # Start the SCO binary emulation if requested. if [ "X${ibcs2_enable}" = X"YES" ]; then echo -n ' ibcs2'; ibcs2 > /dev/null 2>&1 @@ -102,9 +107,9 @@ echo '.' # interrupts for /dev/random device if [ "X${rand_irqs}" != X"NO" ] ; then - echo -n 'entropy source: ' - rndcontrol ${rand_irqs} + echo -n 'entropy IRQs:' + for irq in ${rand_irqs}; do + echo -n " ${irq}" && rndcontrol -q -s ${irq} + done echo '.' fi - - diff --git a/etc/rc.d/pccard b/etc/rc.d/pccard index 06b42105d61e..3b254de6cba1 100644 --- a/etc/rc.d/pccard +++ b/etc/rc.d/pccard @@ -4,11 +4,6 @@ # HOSOKAWA, Tatsumi # -if [ "X$apm_enable" = X"YES" ] ; then - echo "Enable APM BIOS." - apmconf -e -fi - if [ "X$pccard_enable" = X"YES" ] ; then if [ "x$pccard_mem" != "xDEFAULT" ] ; then pccardc pccardmem $pccard_mem diff --git a/etc/rc.pccard b/etc/rc.pccard index 06b42105d61e..3b254de6cba1 100644 --- a/etc/rc.pccard +++ b/etc/rc.pccard @@ -4,11 +4,6 @@ # HOSOKAWA, Tatsumi # -if [ "X$apm_enable" = X"YES" ] ; then - echo "Enable APM BIOS." - apmconf -e -fi - if [ "X$pccard_enable" = X"YES" ] ; then if [ "x$pccard_mem" != "xDEFAULT" ] ; then pccardc pccardmem $pccard_mem