1 |
commit: 353af9d347ee91ea799d5c22b6816df10122583c |
2 |
Author: Robin H. Johnson <robbat2 <AT> gentoo <DOT> org> |
3 |
AuthorDate: Thu Feb 10 21:09:37 2011 +0000 |
4 |
Commit: William Hubbs <williamh <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun May 1 02:42:35 2011 +0000 |
6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/livecd-tools.git;a=commit;h=353af9d3 |
7 |
|
8 |
Hook up list_services to depend need call. |
9 |
|
10 |
--- |
11 |
autoconfig | 33 ++++++++++++++++++++++++++++++++- |
12 |
1 files changed, 32 insertions(+), 1 deletions(-) |
13 |
|
14 |
diff --git a/autoconfig b/autoconfig |
15 |
index 4763bc2..f4a9a6d 100755 |
16 |
--- a/autoconfig |
17 |
+++ b/autoconfig |
18 |
@@ -203,7 +203,7 @@ get_config() { |
19 |
} |
20 |
|
21 |
depend() { |
22 |
- need modules |
23 |
+ need modules $(list_services) |
24 |
before net |
25 |
} |
26 |
|
27 |
@@ -225,6 +225,37 @@ check_svc() { |
28 |
# Prints an ordered list of services that will be started by autoconfig. |
29 |
list_services() { |
30 |
get_config |
31 |
+ # Must not print anything here |
32 |
+ if [ "${DETECT}" = "yes" ] |
33 |
+ then |
34 |
+ local arch="$(uname -m)" |
35 |
+ |
36 |
+ case ${arch} in |
37 |
+ mips*) |
38 |
+ ACPI="no" |
39 |
+ APM="no" |
40 |
+ IDEDMA="no" |
41 |
+ ;; |
42 |
+ i?86|x86_64) |
43 |
+ : |
44 |
+ ;; |
45 |
+ alpha) |
46 |
+ ACPI="no" |
47 |
+ APM="no" |
48 |
+ ;; |
49 |
+ sparc*) |
50 |
+ ACPI="no" |
51 |
+ APM="no" |
52 |
+ ;; |
53 |
+ powerpc*) |
54 |
+ ACPI="no" |
55 |
+ APM="no" |
56 |
+ ;; |
57 |
+ ia64) |
58 |
+ APM="no" |
59 |
+ ;; |
60 |
+ esac |
61 |
+ fi |
62 |
|
63 |
local svcs="$(check_svc ${ACPI} acpid)" |
64 |
svcs="${svcs} $(check_svc ${ALSA} alsasound)" |