| 1 |
Author: wolf31o2 |
| 2 |
Date: 2008-02-25 05:20:35 +0000 (Mon, 25 Feb 2008) |
| 3 |
New Revision: 142 |
| 4 |
|
| 5 |
Modified: |
| 6 |
trunk/autoconfig |
| 7 |
Log: |
| 8 |
Rearrange some of the detection routines so it makes more sense and added brltty= checking. |
| 9 |
|
| 10 |
Modified: trunk/autoconfig |
| 11 |
=================================================================== |
| 12 |
--- trunk/autoconfig 2008-02-08 20:00:53 UTC (rev 141) |
| 13 |
+++ trunk/autoconfig 2008-02-25 05:20:35 UTC (rev 142) |
| 14 |
@@ -6,6 +6,7 @@ |
| 15 |
ACPI="yes" |
| 16 |
ALSA="yes" |
| 17 |
APM="no" |
| 18 |
+BRLTTY="no" |
| 19 |
DETECT="yes" |
| 20 |
DHCP="yes" |
| 21 |
DMRAID="yes" |
| 22 |
@@ -115,13 +116,16 @@ |
| 23 |
nox) |
| 24 |
X11="no" |
| 25 |
;; |
| 26 |
- ide\=nodma) |
| 27 |
- IDEDMA="no" |
| 28 |
- ;; |
| 29 |
acpi\=on|acpi\=force) |
| 30 |
ACPI="yes" |
| 31 |
APM="no" |
| 32 |
;; |
| 33 |
+ brltty=*) |
| 34 |
+ BRLTTY="yes" |
| 35 |
+ ;; |
| 36 |
+ ide\=nodma) |
| 37 |
+ IDEDMA="no" |
| 38 |
+ ;; |
| 39 |
doapm) |
| 40 |
ACPI="no" |
| 41 |
APM="yes" |
| 42 |
@@ -358,23 +362,10 @@ |
| 43 |
# We do this even if we aren't starting up the hotplug/coldplug |
| 44 |
# services for the installer. |
| 45 |
sed -i 's/RC_COLDPLUG="no"/RC_COLDPLUG="yes"/' /etc/conf.d/rc |
| 46 |
- # Now, we check if we're supposed to run a coldplug script. |
| 47 |
- if [ "${HOTPLUG}" = "yes" ] |
| 48 |
+ |
| 49 |
+ if [ "${BRLTTY}" = "yes" ] |
| 50 |
then |
| 51 |
- # Check whether we should be using hotplug/coldplug or whether we should |
| 52 |
- # just let udev do it all. |
| 53 |
- if [ -x /etc/init.d/coldplug ] |
| 54 |
- then |
| 55 |
- start_service coldplug |
| 56 |
- elif [ -x /etc/init.d/hotplug ] |
| 57 |
- then |
| 58 |
- start_service hotplug |
| 59 |
- else |
| 60 |
- unpack_firmware |
| 61 |
- [ -x /sbin/udevtrigger ] && /sbin/udevtrigger |
| 62 |
- fi |
| 63 |
- else |
| 64 |
- ewarn "Hotplug/Coldplug disabled via cmdline ..." |
| 65 |
+ [ -x /etc/init.d/brltty ] && start_service brltty |
| 66 |
fi |
| 67 |
|
| 68 |
if [ "${DETECT}" = "yes" ] |
| 69 |
@@ -417,12 +408,31 @@ |
| 70 |
;; |
| 71 |
esac |
| 72 |
[ -n "${PC}" ] && einfo "${PC}" |
| 73 |
- [ -x /usr/sbin/hwsetup ] && hwsetup |
| 74 |
eend |
| 75 |
else |
| 76 |
ewarn "Hardware detection disabled via cmdline ..." |
| 77 |
fi |
| 78 |
|
| 79 |
+ # Now, we check if we're supposed to run a coldplug script. |
| 80 |
+ if [ "${HOTPLUG}" = "yes" ] |
| 81 |
+ then |
| 82 |
+ # Check whether we should be using hotplug/coldplug or whether we should |
| 83 |
+ # just let udev do it all. |
| 84 |
+ if [ -x /etc/init.d/coldplug ] |
| 85 |
+ then |
| 86 |
+ start_service coldplug |
| 87 |
+ elif [ -x /etc/init.d/hotplug ] |
| 88 |
+ then |
| 89 |
+ start_service hotplug |
| 90 |
+ else |
| 91 |
+ unpack_firmware |
| 92 |
+ [ -x /sbin/udevtrigger ] && /sbin/udevtrigger |
| 93 |
+ fi |
| 94 |
+ [ -x /usr/sbin/hwsetup ] && hwsetup |
| 95 |
+ else |
| 96 |
+ ewarn "Hotplug/Coldplug disabled via cmdline ..." |
| 97 |
+ fi |
| 98 |
+ |
| 99 |
if [ "${APM}" = "yes" ] |
| 100 |
then |
| 101 |
modprobe apm power_off=1 >/dev/null 2>&1 && \ |
| 102 |
|
| 103 |
-- |
| 104 |
gentoo-commits@l.g.o mailing list |
Archives