From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org)
	by finch.gentoo.org with esmtp (Exim 4.60)
	(envelope-from <gentoo-commits+bounces-314884-garchives=archives.gentoo.org@lists.gentoo.org>)
	id 1PndnJ-0005XP-Qo
	for garchives@archives.gentoo.org; Thu, 10 Feb 2011 21:11:18 +0000
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
	by pigeon.gentoo.org (Postfix) with SMTP id 44A74E0960;
	Thu, 10 Feb 2011 21:11:06 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183])
	by pigeon.gentoo.org (Postfix) with ESMTP id 16B08E0960
	for <gentoo-commits@lists.gentoo.org>; Thu, 10 Feb 2011 21:11:06 +0000 (UTC)
Received: from pelican.gentoo.org (unknown [66.219.59.40])
	(using TLSv1 with cipher ADH-CAMELLIA256-SHA (256/256 bits))
	(No client certificate requested)
	by smtp.gentoo.org (Postfix) with ESMTPS id A4EF41B42E4
	for <gentoo-commits@lists.gentoo.org>; Thu, 10 Feb 2011 21:11:05 +0000 (UTC)
Received: from localhost.localdomain (localhost [127.0.0.1])
	by pelican.gentoo.org (Postfix) with ESMTP id 0E3898006E
	for <gentoo-commits@lists.gentoo.org>; Thu, 10 Feb 2011 21:11:05 +0000 (UTC)
From: "Robin H. Johnson" <robbat2@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Robin H. Johnson" <robbat2@gentoo.org>
Message-ID: <a25605a4c3670b5534ec5a4c9419d5a573acdb40.robbat2@gentoo>
Subject: [gentoo-commits] proj/livecd-tools:bl2-only commit in: /
X-VCS-Repository: proj/livecd-tools
X-VCS-Files: autoconfig
X-VCS-Directories: /
X-VCS-Committer: robbat2
X-VCS-Committer-Name: Robin H. Johnson
X-VCS-Revision: a25605a4c3670b5534ec5a4c9419d5a573acdb40
Date: Thu, 10 Feb 2011 21:11:05 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: quoted-printable
X-Archives-Salt: 
X-Archives-Hash: 0a75ba2f1b1c2911a378e4050458c319

commit:     a25605a4c3670b5534ec5a4c9419d5a573acdb40
Author:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Thu Feb 10 21:09:37 2011 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Thu Feb 10 21:09:37 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=3Dproj/livecd-tools.=
git;a=3Dcommit;h=3Da25605a4

Hook up list_services to depend need call.

---
 autoconfig |   33 ++++++++++++++++++++++++++++++++-
 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() {
 }
=20
 depend() {
-	need modules
+	need modules $(list_services)
 	before net
 }
=20
@@ -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}" =3D "yes" ]
+	then
+		local arch=3D"$(uname -m)"
+
+		case ${arch} in
+			mips*)
+				ACPI=3D"no"
+				APM=3D"no"
+				IDEDMA=3D"no"
+			;;
+			i?86|x86_64)
+				:
+			;;
+			alpha)
+				ACPI=3D"no"
+				APM=3D"no"
+			;;
+			sparc*)
+				ACPI=3D"no"
+				APM=3D"no"
+			;;
+			powerpc*)
+				ACPI=3D"no"
+				APM=3D"no"
+			;;
+			ia64)
+				APM=3D"no"
+			;;
+		esac
+	fi
=20
 	local svcs=3D"$(check_svc ${ACPI} acpid)"
 	svcs=3D"${svcs} $(check_svc ${ALSA} alsasound)"