diff options
| author | iwasaki <iwasaki@FreeBSD.org> | 1999-07-12 17:20:29 +0000 |
|---|---|---|
| committer | iwasaki <iwasaki@FreeBSD.org> | 1999-07-12 17:20:29 +0000 |
| commit | 4e7cdaf3e8b23a24febca4a1009692b2a648ecf1 (patch) | |
| tree | 7a323bc98c362e0f72d3d89370e8fe222cd01172 | |
| parent | 13bfe4204bba5f542f868528020a12496d524a3f (diff) | |
| download | FreeBSD-src-4e7cdaf3e8b23a24febca4a1009692b2a648ecf1.zip FreeBSD-src-4e7cdaf3e8b23a24febca4a1009692b2a648ecf1.tar.gz | |
Refine on explanation for apm stuff.
Make it clear that apmd depends on apmconf -e.
Reviewed by: obrien, my friend :-)
| -rw-r--r-- | etc/defaults/rc.conf | 8 | ||||
| -rw-r--r-- | etc/etc.amd64/rc.amd64 | 4 | ||||
| -rw-r--r-- | etc/etc.i386/rc.i386 | 4 |
3 files changed, 8 insertions, 8 deletions
diff --git a/etc/defaults/rc.conf b/etc/defaults/rc.conf index 3ff26bd..d1c17c3 100644 --- a/etc/defaults/rc.conf +++ b/etc/defaults/rc.conf @@ -9,16 +9,16 @@ # # All arguments must be in double or single quotes. # -# $Id: rc.conf,v 1.18 1999/07/09 11:19:01 sheldonh Exp $ +# $Id: rc.conf,v 1.19 1999/07/11 04:05:34 iwasaki Exp $ ############################################################## ### Important initial Boot-time options #################### ############################################################## swapfile="NO" # Set to name of swapfile if aux swapfile desired. -apm_enable="NO" # Set to YES if you want APM enabled. -apmd_enable="NO" # Set to YES if you want APM daemon enabled. -apmd_flags="" # Additional flags for apmd. +apm_enable="NO" # Set to YES to enable APM BIOS functions (or NO). +apmd_enable="NO" # Run apmd to handle APM event from userland. +apmd_flags="" # Flags to apmd (if enabled). pccard_enable="NO" # Set to YES if you want to configure PCCARD devices. pccard_mem="DEFAULT" # If pccard_enable=YES, this is card memory address. pccard_ifconfig="NO" # Specialized pccard ethernet configuration (or NO). diff --git a/etc/etc.amd64/rc.amd64 b/etc/etc.amd64/rc.amd64 index 14828db..397ad5d 100644 --- a/etc/etc.amd64/rc.amd64 +++ b/etc/etc.amd64/rc.amd64 @@ -1,11 +1,11 @@ #!/bin/sh - # -# $Id: rc.i386,v 1.40 1999/07/10 18:02:42 iwasaki Exp $ +# $Id: rc.i386,v 1.41 1999/07/11 04:05:45 iwasaki Exp $ # Do i386 specific processing # echo -n 'Initial rc.i386 initialization:' -if [ "X$apm_enable" = X"YES" ] ; then +if [ "X$apm_enable" = X"YES" -o "X$apmd_enable" = X"YES" ] ; then echo -n ' apm' apmconf -e > /dev/null 2>&1 fi diff --git a/etc/etc.i386/rc.i386 b/etc/etc.i386/rc.i386 index 14828db..397ad5d 100644 --- a/etc/etc.i386/rc.i386 +++ b/etc/etc.i386/rc.i386 @@ -1,11 +1,11 @@ #!/bin/sh - # -# $Id: rc.i386,v 1.40 1999/07/10 18:02:42 iwasaki Exp $ +# $Id: rc.i386,v 1.41 1999/07/11 04:05:45 iwasaki Exp $ # Do i386 specific processing # echo -n 'Initial rc.i386 initialization:' -if [ "X$apm_enable" = X"YES" ] ; then +if [ "X$apm_enable" = X"YES" -o "X$apmd_enable" = X"YES" ] ; then echo -n ' apm' apmconf -e > /dev/null 2>&1 fi |
