[gentoo-commits] proj/livecd-tools:master commit in: /

["William Hubbs" <williamh@gentoo.org>]

commit:     353af9d347ee91ea799d5c22b6816df10122583c
Author:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Thu Feb 10 21:09:37 2011 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Sun May  1 02:42:35 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/livecd-tools.git;a=commit;h=353af9d3

Hook up list_services to depend need call.

---
 autoconfig |   33 ++++++++++++++++++++++++++++++++-
 1 files changed, 32 insertions(+), 1 deletions(-)

diff --git a/autoconfig b/autoconfig
index 4763bc2..f4a9a6d 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)"