| 1 |
Author: wolf31o2 |
| 2 |
Date: 2008-05-17 01:43:40 +0000 (Sat, 17 May 2008) |
| 3 |
New Revision: 150 |
| 4 |
|
| 5 |
Modified: |
| 6 |
trunk/autoconfig |
| 7 |
Log: |
| 8 |
Change nohotplug/dohotplug to nocoldplug/docoldplug to match udev-start.sh's checks. |
| 9 |
|
| 10 |
Modified: trunk/autoconfig |
| 11 |
=================================================================== |
| 12 |
--- trunk/autoconfig 2008-04-08 15:29:01 UTC (rev 149) |
| 13 |
+++ trunk/autoconfig 2008-05-17 01:43:40 UTC (rev 150) |
| 14 |
@@ -7,6 +7,7 @@ |
| 15 |
ALSA="yes" |
| 16 |
APM="no" |
| 17 |
BRLTTY="no" |
| 18 |
+COLDPLUG="yes" |
| 19 |
DETECT="yes" |
| 20 |
DHCP="yes" |
| 21 |
DMRAID="yes" |
| 22 |
@@ -14,7 +15,6 @@ |
| 23 |
FIREWIRE="yes" |
| 24 |
GPM="yes" |
| 25 |
HALD="yes" |
| 26 |
-HOTPLUG="yes" |
| 27 |
IDEDMA="yes" |
| 28 |
LVM="no" |
| 29 |
MDADM="yes" |
| 30 |
@@ -39,13 +39,13 @@ |
| 31 |
ACPI="no" |
| 32 |
ALSA="no" |
| 33 |
APM="no" |
| 34 |
+ COLDPLUG="no" |
| 35 |
DETECT="no" |
| 36 |
DMRAID="no" |
| 37 |
EVMS="no" |
| 38 |
FIREWIRE="no" |
| 39 |
GPM="no" |
| 40 |
HALD="no" |
| 41 |
- HOTPLUG="no" |
| 42 |
LVM="no" |
| 43 |
MDADM="no" |
| 44 |
NET="no" |
| 45 |
@@ -60,6 +60,9 @@ |
| 46 |
noapm) |
| 47 |
APM="no" |
| 48 |
;; |
| 49 |
+ nocoldplug|nohotplug) |
| 50 |
+ COLDPLUG="no" |
| 51 |
+ ;; |
| 52 |
nodhcp) |
| 53 |
DHCP="no" |
| 54 |
;; |
| 55 |
@@ -75,9 +78,6 @@ |
| 56 |
nogpm) |
| 57 |
GPM="no" |
| 58 |
;; |
| 59 |
- nohotplug) |
| 60 |
- HOTPLUG="no" |
| 61 |
- ;; |
| 62 |
noload=*) |
| 63 |
NOLOAD="$*" |
| 64 |
;; |
| 65 |
@@ -131,6 +131,9 @@ |
| 66 |
ACPI="no" |
| 67 |
APM="yes" |
| 68 |
;; |
| 69 |
+ docoldplug|dohotplug) |
| 70 |
+ COLDPLUG="yes" |
| 71 |
+ ;; |
| 72 |
dodhcp) |
| 73 |
DHCP="yes" |
| 74 |
;; |
| 75 |
@@ -146,9 +149,6 @@ |
| 76 |
dogpm) |
| 77 |
GPM="yes" |
| 78 |
;; |
| 79 |
- dohotplug) |
| 80 |
- HOTPLUG="yes" |
| 81 |
- ;; |
| 82 |
dolvm|dolvm2) |
| 83 |
LVM="yes" |
| 84 |
;; |
| 85 |
@@ -217,9 +217,9 @@ |
| 86 |
local svcs="$(check_svc ${ACPI} acpid)" |
| 87 |
svcs="${svcs} $(check_svc ${ALSA} alsasound)" |
| 88 |
svcs="${svcs} $(check_svc ${APM} apmd)" |
| 89 |
+ svcs="${svcs} $(check_svc ${COLDPLUG} coldplug hotplug)" |
| 90 |
svcs="${svcs} $(check_svc ${GPM} gpm)" |
| 91 |
svcs="${svcs} $(check_svc ${HALD} hald)" |
| 92 |
- svcs="${svcs} $(check_svc ${HOTPLUG} coldplug hotplug)" |
| 93 |
svcs="${svcs} $(check_svc ${IDEDMA} hdparm)" |
| 94 |
svcs="${svcs} $(check_svc ${NFS} nfsmount)" |
| 95 |
svcs="${svcs} $(check_svc ${PASSWD} pwgen)" |
| 96 |
@@ -237,7 +237,7 @@ |
| 97 |
# This unpacks any firmware tarballs. |
| 98 |
if [ -e /lib/firmware.tar.bz2 ] |
| 99 |
then |
| 100 |
- ebegin "Unpacking hotplug firmware" |
| 101 |
+ ebegin "Unpacking firmware" |
| 102 |
tar xjf /lib/firmware.tar.bz2 -C /lib/firmware |
| 103 |
eend 0 |
| 104 |
fi |
| 105 |
@@ -359,11 +359,6 @@ |
| 106 |
echo "0" > /proc/sys/kernel/printk |
| 107 |
get_config |
| 108 |
|
| 109 |
- # First off, we want hotplug/coldplug enabled, so we re-enable it. |
| 110 |
- # We do this even if we are not starting up the hotplug/coldplug |
| 111 |
- # services for the installer. |
| 112 |
- sed -i 's/RC_COLDPLUG="no"/RC_COLDPLUG="yes"/' /etc/conf.d/rc |
| 113 |
- |
| 114 |
if [ "${BRLTTY}" = "yes" ] |
| 115 |
then |
| 116 |
[ -x /etc/init.d/brltty ] && start_service brltty |
| 117 |
@@ -415,7 +410,7 @@ |
| 118 |
fi |
| 119 |
|
| 120 |
# Now, we check if we are supposed to run a coldplug script. |
| 121 |
- if [ "${HOTPLUG}" = "yes" ] |
| 122 |
+ if [ "${COLDPLUG}" = "yes" ] |
| 123 |
then |
| 124 |
# Check whether we should be using hotplug/coldplug or whether we should |
| 125 |
# just let udev do it all. |
| 126 |
|
| 127 |
-- |
| 128 |
gentoo-commits@l.g.o mailing list |
Archives