aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--init.d.BSD/hostid2
-rw-r--r--init.d.BSD/moused2
-rw-r--r--init.d.BSD/pf2
-rwxr-xr-xinit.d.BSD/savecore2
-rw-r--r--init.d.FreeBSD/clock2
-rw-r--r--init.d.FreeBSD/devd2
-rw-r--r--init.d.FreeBSD/dumpon2
-rw-r--r--init.d.FreeBSD/ipfw2
-rw-r--r--init.d.FreeBSD/mixer2
-rw-r--r--init.d.FreeBSD/powerd2
-rw-r--r--init.d.FreeBSD/syscons2
-rwxr-xr-xinit.d.Linux/clock2
-rwxr-xr-xinit.d.Linux/consolefont2
-rwxr-xr-xinit.d.Linux/keymaps2
-rwxr-xr-xinit.d.Linux/modules2
-rw-r--r--init.d.Linux/sysctl2
-rw-r--r--init.d/fsck2
-rwxr-xr-xinit.d/local2
-rwxr-xr-xinit.d/localmount2
-rwxr-xr-xinit.d/netmount2
-rw-r--r--init.d/root2
-rw-r--r--init.d/swap2
-rwxr-xr-xinit.d/urandom2
-rw-r--r--man/runscript.82
-rwxr-xr-xsh/gendepends.sh6
-rwxr-xr-xsh/net.sh4
-rw-r--r--src/librc/librc-depend.c2
-rw-r--r--src/rc/runscript.c2
28 files changed, 31 insertions, 31 deletions
diff --git a/init.d.BSD/hostid b/init.d.BSD/hostid
index c4087512..3eb4c4fe 100644
--- a/init.d.BSD/hostid
+++ b/init.d.BSD/hostid
@@ -9,7 +9,7 @@ depend()
{
need root
before devd net
- keywords nojail
+ keyword nojail
}
_set()
diff --git a/init.d.BSD/moused b/init.d.BSD/moused
index 85015684..94c68127 100644
--- a/init.d.BSD/moused
+++ b/init.d.BSD/moused
@@ -16,7 +16,7 @@ depend()
{
need localmount
after bootmisc
- keywords nojail
+ keyword nojail
}
start()
diff --git a/init.d.BSD/pf b/init.d.BSD/pf
index 4a615ec7..0b6208e8 100644
--- a/init.d.BSD/pf
+++ b/init.d.BSD/pf
@@ -11,7 +11,7 @@ extra_started_commands="reload"
depend() {
need localmount
- keywords nojail
+ keyword nojail
}
start()
diff --git a/init.d.BSD/savecore b/init.d.BSD/savecore
index 3b9ffb29..6784a1d5 100755
--- a/init.d.BSD/savecore
+++ b/init.d.BSD/savecore
@@ -7,7 +7,7 @@ description="Saves a kernel dump."
depend()
{
need localmount
- keywords nojail
+ keyword nojail
}
start()
diff --git a/init.d.FreeBSD/clock b/init.d.FreeBSD/clock
index 6a8485c9..7fcb0256 100644
--- a/init.d.FreeBSD/clock
+++ b/init.d.FreeBSD/clock
@@ -21,7 +21,7 @@ depend()
[ "${clock}" != "UTC" -a ! -e /etc/wall_cmos_clock ]; then
need root
fi
- keywords nojail
+ keyword nojail
}
start()
diff --git a/init.d.FreeBSD/devd b/init.d.FreeBSD/devd
index 76706b43..04ed3af5 100644
--- a/init.d.FreeBSD/devd
+++ b/init.d.FreeBSD/devd
@@ -10,7 +10,7 @@ depend() {
need localmount
after bootmisc
before net.lo0
- keywords nojail
+ keyword nojail
}
start_pre() {
diff --git a/init.d.FreeBSD/dumpon b/init.d.FreeBSD/dumpon
index fbe3d1c3..b69e4ffe 100644
--- a/init.d.FreeBSD/dumpon
+++ b/init.d.FreeBSD/dumpon
@@ -6,7 +6,7 @@ description="Configures a specific kernel dump device."
depend() {
need swap
- keywords nojail
+ keyword nojail
}
start() {
diff --git a/init.d.FreeBSD/ipfw b/init.d.FreeBSD/ipfw
index 5ef366b2..200b9cee 100644
--- a/init.d.FreeBSD/ipfw
+++ b/init.d.FreeBSD/ipfw
@@ -13,7 +13,7 @@ opts="panic showstatus"
depend() {
before net
provide firewall
- keywords nojail
+ keyword nojail
}
ipfw() {
diff --git a/init.d.FreeBSD/mixer b/init.d.FreeBSD/mixer
index c169033c..b8c8f3af 100644
--- a/init.d.FreeBSD/mixer
+++ b/init.d.FreeBSD/mixer
@@ -7,7 +7,7 @@ extra_commands="restore"
depend()
{
need localmount
- keywords nojail
+ keyword nojail
}
restore()
diff --git a/init.d.FreeBSD/powerd b/init.d.FreeBSD/powerd
index b44128e0..106962a6 100644
--- a/init.d.FreeBSD/powerd
+++ b/init.d.FreeBSD/powerd
@@ -12,7 +12,7 @@ depend()
need localmount
use logger
after bootmisc
- keywords nojail
+ keyword nojail
}
start_pre()
diff --git a/init.d.FreeBSD/syscons b/init.d.FreeBSD/syscons
index af76baba..45ed5b0c 100644
--- a/init.d.FreeBSD/syscons
+++ b/init.d.FreeBSD/syscons
@@ -4,7 +4,7 @@
depend() {
need localmount
- keywords nojail
+ keyword nojail
}
start() {
diff --git a/init.d.Linux/clock b/init.d.Linux/clock
index 03e5b133..691f3218 100755
--- a/init.d.Linux/clock
+++ b/init.d.Linux/clock
@@ -28,7 +28,7 @@ depend()
else
before *
fi
- keywords nouml novps noxenu
+ keyword nouml novps noxenu
}
setupopts()
diff --git a/init.d.Linux/consolefont b/init.d.Linux/consolefont
index 28a2cdb0..7bf6bfc7 100755
--- a/init.d.Linux/consolefont
+++ b/init.d.Linux/consolefont
@@ -9,7 +9,7 @@ depend()
need localmount
need keymaps # sets up terminal encoding scheme
after hotplug
- keywords nouml novps noxenu
+ keyword nouml novps noxenu
}
start()
diff --git a/init.d.Linux/keymaps b/init.d.Linux/keymaps
index a60a949a..b09137d5 100755
--- a/init.d.Linux/keymaps
+++ b/init.d.Linux/keymaps
@@ -15,7 +15,7 @@ dumpkeys_charset=${dumpkeys_charset:-${DUMPKEYS_CHARSET}}
depend()
{
need localmount
- keywords nouml novps noxenu
+ keyword nouml novps noxenu
}
start()
diff --git a/init.d.Linux/modules b/init.d.Linux/modules
index f29d0a15..c3064d16 100755
--- a/init.d.Linux/modules
+++ b/init.d.Linux/modules
@@ -7,7 +7,7 @@ description="Loads a user defined list of kernel modules."
depend()
{
use isapnp
- keywords novps
+ keyword novps
}
start()
diff --git a/init.d.Linux/sysctl b/init.d.Linux/sysctl
index 81dced9e..0a490405 100644
--- a/init.d.Linux/sysctl
+++ b/init.d.Linux/sysctl
@@ -6,7 +6,7 @@ depend()
{
use hostname
before bootmisc logger
- keywords novps
+ keyword novps
}
start()
diff --git a/init.d/fsck b/init.d/fsck
index 4c184cf2..e899accf 100644
--- a/init.d/fsck
+++ b/init.d/fsck
@@ -7,7 +7,7 @@ description="Check and repair filesystems according to /etc/fstab"
depend()
{
after clock modules
- keywords nojail notimeout
+ keyword nojail notimeout
}
start()
diff --git a/init.d/local b/init.d/local
index dbb06b54..9b83752d 100755
--- a/init.d/local
+++ b/init.d/local
@@ -7,7 +7,7 @@ description="Executes user commands in /etc/conf.d/local"
depend()
{
after *
- keywords notimeout
+ keyword notimeout
}
start()
diff --git a/init.d/localmount b/init.d/localmount
index 999fa076..a598a712 100755
--- a/init.d/localmount
+++ b/init.d/localmount
@@ -8,7 +8,7 @@ depend()
{
need fsck
use modules mtab
- keywords nojail
+ keyword nojail
}
start()
diff --git a/init.d/netmount b/init.d/netmount
index bb97d88a..688b0f4e 100755
--- a/init.d/netmount
+++ b/init.d/netmount
@@ -34,7 +34,7 @@ depend()
config /etc/fstab
need net ${pmap}
use afc-client amd autofs dns nfs nfsmount portmap rpcbind rpc.statd
- keywords nojail
+ keyword nojail
}
start()
diff --git a/init.d/root b/init.d/root
index 948826e5..ff4726ba 100644
--- a/init.d/root
+++ b/init.d/root
@@ -7,7 +7,7 @@ description="Mount the root fs read/write"
depend()
{
need fsck
- keywords nojail
+ keyword nojail
}
start()
diff --git a/init.d/swap b/init.d/swap
index c11abb55..c8b1ab8a 100644
--- a/init.d/swap
+++ b/init.d/swap
@@ -5,7 +5,7 @@
depend()
{
need localmount
- keywords nojail
+ keyword nojail
}
start()
diff --git a/init.d/urandom b/init.d/urandom
index bc1e7b7d..3fc0a6d0 100755
--- a/init.d/urandom
+++ b/init.d/urandom
@@ -9,7 +9,7 @@ description="Initializes the random number generator."
depend()
{
need localmount
- keywords nojail
+ keyword nojail
}
save_seed()
diff --git a/man/runscript.8 b/man/runscript.8
index 2c62ece2..40e3313f 100644
--- a/man/runscript.8
+++ b/man/runscript.8
@@ -131,7 +131,7 @@ The service will start before these services and stop after these services.
We provide this virtual service. For example, named provides dns.
.It Ic config
We should recalculate our dependencies if the listed files have changed.
-.It Ic keywords
+.It Ic keyword
Tags a service with a keyword. Here's the keywords we currently understand:-
.Bl -tag -width indent
.It Dv nojail
diff --git a/sh/gendepends.sh b/sh/gendepends.sh
index 0fd5b199..712d29ff 100755
--- a/sh/gendepends.sh
+++ b/sh/gendepends.sh
@@ -24,8 +24,8 @@ after() {
provide() {
[ -n "$*" ] && echo "${SVCNAME} iprovide $*" >&3
}
-keywords() {
- [ -n "$*" ] && echo "${SVCNAME} keywords $*" >&3
+keyword() {
+ [ -n "$*" ] && echo "${SVCNAME} keyword $*" >&3
}
depend() {
:
@@ -66,7 +66,7 @@ for _dir in /etc/init.d /usr/local/etc/init.d; do
depend
# Add any user defined depends
- for _deptype in config need use after before provide keywords; do
+ for _deptype in config need use after before provide keyword; do
eval _depends=\$rc_$(shell_var "${SVCNAME}")_${_deptype}
[ -z "${_depends}" ] && eval _depends=\$rc_${_deptype}
${_deptype} ${_depends}
diff --git a/sh/net.sh b/sh/net.sh
index 7dc282fa..acf8dba7 100755
--- a/sh/net.sh
+++ b/sh/net.sh
@@ -21,7 +21,7 @@ depend()
need localmount
after bootmisc
provide net
- keywords nojail
+ keyword nojail
case "${IFACE}" in
lo|lo0);;
@@ -33,7 +33,7 @@ depend()
fi
local dep= prov=
- for dep in need use before after provide keywords; do
+ for dep in need use before after provide keyword; do
eval prov=\$rc_${dep}_${IFVAR}
if [ -n "${prov}" ]; then
${dep} ${prov}
diff --git a/src/librc/librc-depend.c b/src/librc/librc-depend.c
index c7c782c7..9b8dfd61 100644
--- a/src/librc/librc-depend.c
+++ b/src/librc/librc-depend.c
@@ -881,7 +881,7 @@ next:
for (depinfo = deptree; depinfo; depinfo = depinfo->next)
{
bool removed = false;
- if ((deptype = get_deptype (depinfo, "keywords"))) {
+ if ((deptype = get_deptype (depinfo, "keyword"))) {
STRLIST_FOREACH (deptype->services, service, i)
if (strcmp (service, nosys) == 0) {
if (last_depinfo)
diff --git a/src/rc/runscript.c b/src/rc/runscript.c
index a50edf2c..3d900c0c 100644
--- a/src/rc/runscript.c
+++ b/src/rc/runscript.c
@@ -515,7 +515,7 @@ static bool svc_wait (rc_depinfo_t *depinfo, const char *svc)
return (false);
/* Some services don't have a timeout, like fsck */
- keywords = rc_deptree_depend (depinfo, svc, "keywords");
+ keywords = rc_deptree_depend (depinfo, svc, "keyword");
STRLIST_FOREACH (keywords, s, i) {
if (strcmp (s, "notimeout") == 0) {
forever = true;
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-10 16:02:37 +0000