diff options
| author |   Chris Gianelloni <wolf31o2@gentoo.org> | 2008-02-25 05:20:35 +0000 |
|---|---|---|
| committer | Chris Gianelloni <wolf31o2@gentoo.org> | 2008-02-25 05:20:35 +0000 |
| commit | d95f98339c9fd3f9e609b9cbc83b59b0c4447432 (patch) | |
| tree | 0266f0e383aa068badaad761559d9a877b463c3b /autoconfig | |
| parent | Added some initial hald checking. (diff) | |
| download | livecd-tools-d95f98339c9fd3f9e609b9cbc83b59b0c4447432.tar.gz livecd-tools-d95f98339c9fd3f9e609b9cbc83b59b0c4447432.tar.bz2 livecd-tools-d95f98339c9fd3f9e609b9cbc83b59b0c4447432.zip | |
Rearrange some of the detection routines so it makes more sense and added brltty= checking.
git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/livecd-tools/trunk@142 7bf51bff-881f-0410-a643-fba68b97345e
Diffstat (limited to 'autoconfig')
| -rwxr-xr-x | autoconfig | 50 |
1 files changed, 30 insertions, 20 deletions
@@ -6,6 +6,7 @@ ACPI="yes" ALSA="yes" APM="no" +BRLTTY="no" DETECT="yes" DHCP="yes" DMRAID="yes" @@ -115,13 +116,16 @@ get_config() { nox) X11="no" ;; - ide\=nodma) - IDEDMA="no" - ;; acpi\=on|acpi\=force) ACPI="yes" APM="no" ;; + brltty=*) + BRLTTY="yes" + ;; + ide\=nodma) + IDEDMA="no" + ;; doapm) ACPI="no" APM="yes" @@ -358,23 +362,10 @@ start() { # We do this even if we aren't starting up the hotplug/coldplug # services for the installer. sed -i 's/RC_COLDPLUG="no"/RC_COLDPLUG="yes"/' /etc/conf.d/rc - # Now, we check if we're supposed to run a coldplug script. - if [ "${HOTPLUG}" = "yes" ] + + if [ "${BRLTTY}" = "yes" ] then - # Check whether we should be using hotplug/coldplug or whether we should - # just let udev do it all. - if [ -x /etc/init.d/coldplug ] - then - start_service coldplug - elif [ -x /etc/init.d/hotplug ] - then - start_service hotplug - else - unpack_firmware - [ -x /sbin/udevtrigger ] && /sbin/udevtrigger - fi - else - ewarn "Hotplug/Coldplug disabled via cmdline ..." + [ -x /etc/init.d/brltty ] && start_service brltty fi if [ "${DETECT}" = "yes" ] @@ -417,12 +408,31 @@ start() { ;; esac [ -n "${PC}" ] && einfo "${PC}" - [ -x /usr/sbin/hwsetup ] && hwsetup eend else ewarn "Hardware detection disabled via cmdline ..." fi + # Now, we check if we're supposed to run a coldplug script. + if [ "${HOTPLUG}" = "yes" ] + then + # Check whether we should be using hotplug/coldplug or whether we should + # just let udev do it all. + if [ -x /etc/init.d/coldplug ] + then + start_service coldplug + elif [ -x /etc/init.d/hotplug ] + then + start_service hotplug + else + unpack_firmware + [ -x /sbin/udevtrigger ] && /sbin/udevtrigger + fi + [ -x /usr/sbin/hwsetup ] && hwsetup + else + ewarn "Hotplug/Coldplug disabled via cmdline ..." + fi + if [ "${APM}" = "yes" ] then modprobe apm power_off=1 >/dev/null 2>&1 && \ |