aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatt Turner <mattst88@gentoo.org>2020-03-30 20:25:48 -0700
committerMatt Turner <mattst88@gentoo.org>2020-03-30 20:54:29 -0700
commitf82226cf8a9f09099557ef344dce60b7d4d6f663 (patch)
tree92899d06613ddea1c28bbac6d787a7589c1d50a9
parentdoc: Fix some typos (diff)
downloadcatalyst-f82226cf.tar.gz
catalyst-f82226cf.tar.bz2
catalyst-f82226cf.zip
catalyst: Remove references to spind
spind was deleted from livecd-tools in 2011. See: https://gitweb.gentoo.org/proj/livecd-tools.git/commit/?id=7d4d363bae7313e46de960a45888907059b0f2d6 Signed-off-by: Matt Turner <mattst88@gentoo.org>
-rw-r--r--doc/catalyst-spec.5.txt2
-rw-r--r--examples/livecd-stage2_template.spec2
-rw-r--r--examples/stage4_template.spec2
-rwxr-xr-xtargets/support/rc-update.sh7
4 files changed, 3 insertions, 10 deletions
diff --git a/doc/catalyst-spec.5.txt b/doc/catalyst-spec.5.txt
index 4c0be357..ecea9ba7 100644
--- a/doc/catalyst-spec.5.txt
+++ b/doc/catalyst-spec.5.txt
@@ -319,7 +319,7 @@ the `stage4` and `livecd` targets.
This is for adding init scripts to runlevels. The syntax for the init
script is the script name, followed by a pipe, followed by the
runlevel in which you want the script to run. It looks like
-`spind|default` and is space delimited. We do not use this on the
+`acpid|default` and is space delimited. We do not use this on the
official media, as catalyst sets up the runlevels correctly for us.
This setting is supported by the `stage4` and `livecd` targets.
diff --git a/examples/livecd-stage2_template.spec b/examples/livecd-stage2_template.spec
index fe9b36e7..0c45bd67 100644
--- a/examples/livecd-stage2_template.spec
+++ b/examples/livecd-stage2_template.spec
@@ -188,7 +188,7 @@ livecd/modblacklist:
# This is for adding init scripts to runlevels. The syntax for the init script
# is the script name, followed by a pipe, followed by the runlevel in which you
-# want the script to run. It looks like spind|default and is space delimited.
+# want the script to run. It looks like acpid|default and is space delimited.
# We do not use this on the official media, as catalyst sets up the runlevels
# correctly for us. Since we do not use this, it is left blank below.
# This option will automatically create missing runlevels
diff --git a/examples/stage4_template.spec b/examples/stage4_template.spec
index fe394f3e..f3531f90 100644
--- a/examples/stage4_template.spec
+++ b/examples/stage4_template.spec
@@ -148,7 +148,7 @@ stage4/modblacklist:
# This is for adding init scripts to runlevels. The syntax for the init script
# is the script name, followed by a pipe, followed by the runlevel in which you
-# want the script to run. It looks like spind|default and is space delimited.
+# want the script to run. It looks like acpid|default and is space delimited.
# We do not use this on the official media, as catalyst sets up the runlevels
# correctly for us. Since we do not use this, it is left blank below.
# example:
diff --git a/targets/support/rc-update.sh b/targets/support/rc-update.sh
index 3941f2e0..6e739966 100755
--- a/targets/support/rc-update.sh
+++ b/targets/support/rc-update.sh
@@ -18,16 +18,9 @@ then
# Do some livecd_type specific rc-update changes
case ${clst_livecd_type} in
- gentoo-gamecd)
- rc-update add spind default
- ;;
gentoo-release-live*)
- rc-update add spind default
rc-update add xdm default
;;
- generic-livecd)
- rc-update add spind default
- ;;
esac
fi