summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobin H. Johnson <robbat2@gentoo.org>2011-02-10 21:09:37 +0000
committerRobin H. Johnson <robbat2@gentoo.org>2011-02-10 21:09:37 +0000
commita25605a4c3670b5534ec5a4c9419d5a573acdb40 (patch)
tree2055fccd14e8452a1d582194ea2c6aa7216569f3
parentAdd conversion of GPM as first example for BL2 work. (diff)
downloadlivecd-tools-a25605a4c3670b5534ec5a4c9419d5a573acdb40.tar.gz
livecd-tools-a25605a4c3670b5534ec5a4c9419d5a573acdb40.tar.bz2
livecd-tools-a25605a4c3670b5534ec5a4c9419d5a573acdb40.zip
Hook up list_services to depend need call.
-rwxr-xr-xautoconfig33
1 files changed, 32 insertions, 1 deletions
diff --git a/autoconfig b/autoconfig
index 2d5ef86..5fd4fc5 100755
--- a/autoconfig
+++ b/autoconfig
@@ -203,7 +203,7 @@ get_config() {
}
depend() {
- need modules
+ need modules $(list_services)
before net
}
@@ -225,6 +225,37 @@ check_svc() {
# Prints an ordered list of services that will be started by autoconfig.
list_services() {
get_config
+ # Must not print anything here
+ if [ "${DETECT}" = "yes" ]
+ then
+ local arch="$(uname -m)"
+
+ case ${arch} in
+ mips*)
+ ACPI="no"
+ APM="no"
+ IDEDMA="no"
+ ;;
+ i?86|x86_64)
+ :
+ ;;
+ alpha)
+ ACPI="no"
+ APM="no"
+ ;;
+ sparc*)
+ ACPI="no"
+ APM="no"
+ ;;
+ powerpc*)
+ ACPI="no"
+ APM="no"
+ ;;
+ ia64)
+ APM="no"
+ ;;
+ esac
+ fi
local svcs="$(check_svc ${ACPI} acpid)"
svcs="${svcs} $(check_svc ${ALSA} alsasound)"