/[livecd-tools]/trunk/autoconfig
Gentoo

Diff of /trunk/autoconfig

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

Revision 149 Revision 150
5 5
6ACPI="yes" 6ACPI="yes"
7ALSA="yes" 7ALSA="yes"
8APM="no" 8APM="no"
9BRLTTY="no" 9BRLTTY="no"
10COLDPLUG="yes"
10DETECT="yes" 11DETECT="yes"
11DHCP="yes" 12DHCP="yes"
12DMRAID="yes" 13DMRAID="yes"
13EVMS="no" 14EVMS="no"
14FIREWIRE="yes" 15FIREWIRE="yes"
15GPM="yes" 16GPM="yes"
16HALD="yes" 17HALD="yes"
17HOTPLUG="yes"
18IDEDMA="yes" 18IDEDMA="yes"
19LVM="no" 19LVM="no"
20MDADM="yes" 20MDADM="yes"
21NET="yes" 21NET="yes"
22NFS="yes" 22NFS="yes"
37 # We put nodetect first, so we can override it with do* commands 37 # We put nodetect first, so we can override it with do* commands
38 nodetect) 38 nodetect)
39 ACPI="no" 39 ACPI="no"
40 ALSA="no" 40 ALSA="no"
41 APM="no" 41 APM="no"
42 COLDPLUG="no"
42 DETECT="no" 43 DETECT="no"
43 DMRAID="no" 44 DMRAID="no"
44 EVMS="no" 45 EVMS="no"
45 FIREWIRE="no" 46 FIREWIRE="no"
46 GPM="no" 47 GPM="no"
47 HALD="no" 48 HALD="no"
48 HOTPLUG="no"
49 LVM="no" 49 LVM="no"
50 MDADM="no" 50 MDADM="no"
51 NET="no" 51 NET="no"
52 NFS="no" 52 NFS="no"
53 PCMCIA="no" 53 PCMCIA="no"
58 X11="no" 58 X11="no"
59 ;; 59 ;;
60 noapm) 60 noapm)
61 APM="no" 61 APM="no"
62 ;; 62 ;;
63 nocoldplug|nohotplug)
64 COLDPLUG="no"
65 ;;
63 nodhcp) 66 nodhcp)
64 DHCP="no" 67 DHCP="no"
65 ;; 68 ;;
66 nodmraid) 69 nodmraid)
67 DMRAID="no" 70 DMRAID="no"
72 nofirewire) 75 nofirewire)
73 FIREWIRE="no" 76 FIREWIRE="no"
74 ;; 77 ;;
75 nogpm) 78 nogpm)
76 GPM="no" 79 GPM="no"
77 ;;
78 nohotplug)
79 HOTPLUG="no"
80 ;; 80 ;;
81 noload=*) 81 noload=*)
82 NOLOAD="$*" 82 NOLOAD="$*"
83 ;; 83 ;;
84 nolvm|nolvm2) 84 nolvm|nolvm2)
129 ;; 129 ;;
130 doapm) 130 doapm)
131 ACPI="no" 131 ACPI="no"
132 APM="yes" 132 APM="yes"
133 ;; 133 ;;
134 docoldplug|dohotplug)
135 COLDPLUG="yes"
136 ;;
134 dodhcp) 137 dodhcp)
135 DHCP="yes" 138 DHCP="yes"
136 ;; 139 ;;
137 dodmraid) 140 dodmraid)
138 DMRAID="yes" 141 DMRAID="yes"
143 dofirewire) 146 dofirewire)
144 FIREWIRE="yes" 147 FIREWIRE="yes"
145 ;; 148 ;;
146 dogpm) 149 dogpm)
147 GPM="yes" 150 GPM="yes"
148 ;;
149 dohotplug)
150 HOTPLUG="yes"
151 ;; 151 ;;
152 dolvm|dolvm2) 152 dolvm|dolvm2)
153 LVM="yes" 153 LVM="yes"
154 ;; 154 ;;
155 domdadm) 155 domdadm)
215 get_config 215 get_config
216 216
217 local svcs="$(check_svc ${ACPI} acpid)" 217 local svcs="$(check_svc ${ACPI} acpid)"
218 svcs="${svcs} $(check_svc ${ALSA} alsasound)" 218 svcs="${svcs} $(check_svc ${ALSA} alsasound)"
219 svcs="${svcs} $(check_svc ${APM} apmd)" 219 svcs="${svcs} $(check_svc ${APM} apmd)"
220 svcs="${svcs} $(check_svc ${COLDPLUG} coldplug hotplug)"
220 svcs="${svcs} $(check_svc ${GPM} gpm)" 221 svcs="${svcs} $(check_svc ${GPM} gpm)"
221 svcs="${svcs} $(check_svc ${HALD} hald)" 222 svcs="${svcs} $(check_svc ${HALD} hald)"
222 svcs="${svcs} $(check_svc ${HOTPLUG} coldplug hotplug)"
223 svcs="${svcs} $(check_svc ${IDEDMA} hdparm)" 223 svcs="${svcs} $(check_svc ${IDEDMA} hdparm)"
224 svcs="${svcs} $(check_svc ${NFS} nfsmount)" 224 svcs="${svcs} $(check_svc ${NFS} nfsmount)"
225 svcs="${svcs} $(check_svc ${PASSWD} pwgen)" 225 svcs="${svcs} $(check_svc ${PASSWD} pwgen)"
226 svcs="${svcs} $(check_svc ${PCMCIA} pcmcia)" 226 svcs="${svcs} $(check_svc ${PCMCIA} pcmcia)"
227 svcs="${svcs} $(check_svc ${SSH} sshd)" 227 svcs="${svcs} $(check_svc ${SSH} sshd)"
235 235
236unpack_firmware() { 236unpack_firmware() {
237 # This unpacks any firmware tarballs. 237 # This unpacks any firmware tarballs.
238 if [ -e /lib/firmware.tar.bz2 ] 238 if [ -e /lib/firmware.tar.bz2 ]
239 then 239 then
240 ebegin "Unpacking hotplug firmware" 240 ebegin "Unpacking firmware"
241 tar xjf /lib/firmware.tar.bz2 -C /lib/firmware 241 tar xjf /lib/firmware.tar.bz2 -C /lib/firmware
242 eend 0 242 eend 0
243 fi 243 fi
244} 244}
245 245
357 357
358start() { 358start() {
359 echo "0" > /proc/sys/kernel/printk 359 echo "0" > /proc/sys/kernel/printk
360 get_config 360 get_config
361 361
362 # First off, we want hotplug/coldplug enabled, so we re-enable it.
363 # We do this even if we are not starting up the hotplug/coldplug
364 # services for the installer.
365 sed -i 's/RC_COLDPLUG="no"/RC_COLDPLUG="yes"/' /etc/conf.d/rc
366
367 if [ "${BRLTTY}" = "yes" ] 362 if [ "${BRLTTY}" = "yes" ]
368 then 363 then
369 [ -x /etc/init.d/brltty ] && start_service brltty 364 [ -x /etc/init.d/brltty ] && start_service brltty
370 fi 365 fi
371 366
413 else 408 else
414 ewarn "Hardware detection disabled via cmdline ..." 409 ewarn "Hardware detection disabled via cmdline ..."
415 fi 410 fi
416 411
417 # Now, we check if we are supposed to run a coldplug script. 412 # Now, we check if we are supposed to run a coldplug script.
418 if [ "${HOTPLUG}" = "yes" ] 413 if [ "${COLDPLUG}" = "yes" ]
419 then 414 then
420 # Check whether we should be using hotplug/coldplug or whether we should 415 # Check whether we should be using hotplug/coldplug or whether we should
421 # just let udev do it all. 416 # just let udev do it all.
422 if [ -x /etc/init.d/coldplug ] 417 if [ -x /etc/init.d/coldplug ]
423 then 418 then

Legend:
Removed from v.149  
changed lines
  Added in v.150

  ViewVC Help
Powered by ViewVC 1.1.20