1 |
commit: f82226cf8a9f09099557ef344dce60b7d4d6f663 |
2 |
Author: Matt Turner <mattst88 <AT> gentoo <DOT> org> |
3 |
AuthorDate: Tue Mar 31 03:25:48 2020 +0000 |
4 |
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Mar 31 03:54:29 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=f82226cf |
7 |
|
8 |
catalyst: Remove references to spind |
9 |
|
10 |
spind was deleted from livecd-tools in 2011. |
11 |
|
12 |
See: https://gitweb.gentoo.org/proj/livecd-tools.git/commit/?id=7d4d363bae7313e46de960a45888907059b0f2d6 |
13 |
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org> |
14 |
|
15 |
doc/catalyst-spec.5.txt | 2 +- |
16 |
examples/livecd-stage2_template.spec | 2 +- |
17 |
examples/stage4_template.spec | 2 +- |
18 |
targets/support/rc-update.sh | 7 ------- |
19 |
4 files changed, 3 insertions(+), 10 deletions(-) |
20 |
|
21 |
diff --git a/doc/catalyst-spec.5.txt b/doc/catalyst-spec.5.txt |
22 |
index 4c0be357..ecea9ba7 100644 |
23 |
--- a/doc/catalyst-spec.5.txt |
24 |
+++ b/doc/catalyst-spec.5.txt |
25 |
@@ -319,7 +319,7 @@ the `stage4` and `livecd` targets. |
26 |
This is for adding init scripts to runlevels. The syntax for the init |
27 |
script is the script name, followed by a pipe, followed by the |
28 |
runlevel in which you want the script to run. It looks like |
29 |
-`spind|default` and is space delimited. We do not use this on the |
30 |
+`acpid|default` and is space delimited. We do not use this on the |
31 |
official media, as catalyst sets up the runlevels correctly for us. |
32 |
This setting is supported by the `stage4` and `livecd` targets. |
33 |
|
34 |
|
35 |
diff --git a/examples/livecd-stage2_template.spec b/examples/livecd-stage2_template.spec |
36 |
index fe9b36e7..0c45bd67 100644 |
37 |
--- a/examples/livecd-stage2_template.spec |
38 |
+++ b/examples/livecd-stage2_template.spec |
39 |
@@ -188,7 +188,7 @@ livecd/modblacklist: |
40 |
|
41 |
# This is for adding init scripts to runlevels. The syntax for the init script |
42 |
# is the script name, followed by a pipe, followed by the runlevel in which you |
43 |
-# want the script to run. It looks like spind|default and is space delimited. |
44 |
+# want the script to run. It looks like acpid|default and is space delimited. |
45 |
# We do not use this on the official media, as catalyst sets up the runlevels |
46 |
# correctly for us. Since we do not use this, it is left blank below. |
47 |
# This option will automatically create missing runlevels |
48 |
|
49 |
diff --git a/examples/stage4_template.spec b/examples/stage4_template.spec |
50 |
index fe394f3e..f3531f90 100644 |
51 |
--- a/examples/stage4_template.spec |
52 |
+++ b/examples/stage4_template.spec |
53 |
@@ -148,7 +148,7 @@ stage4/modblacklist: |
54 |
|
55 |
# This is for adding init scripts to runlevels. The syntax for the init script |
56 |
# is the script name, followed by a pipe, followed by the runlevel in which you |
57 |
-# want the script to run. It looks like spind|default and is space delimited. |
58 |
+# want the script to run. It looks like acpid|default and is space delimited. |
59 |
# We do not use this on the official media, as catalyst sets up the runlevels |
60 |
# correctly for us. Since we do not use this, it is left blank below. |
61 |
# example: |
62 |
|
63 |
diff --git a/targets/support/rc-update.sh b/targets/support/rc-update.sh |
64 |
index 3941f2e0..6e739966 100755 |
65 |
--- a/targets/support/rc-update.sh |
66 |
+++ b/targets/support/rc-update.sh |
67 |
@@ -18,16 +18,9 @@ then |
68 |
|
69 |
# Do some livecd_type specific rc-update changes |
70 |
case ${clst_livecd_type} in |
71 |
- gentoo-gamecd) |
72 |
- rc-update add spind default |
73 |
- ;; |
74 |
gentoo-release-live*) |
75 |
- rc-update add spind default |
76 |
rc-update add xdm default |
77 |
;; |
78 |
- generic-livecd) |
79 |
- rc-update add spind default |
80 |
- ;; |
81 |
esac |
82 |
fi |