keywords -> keyword

init.d.BSD/hostid

@@ -9,7 +9,7 @@ depend()
 {
 	need root
 	before devd net
-	keywords nojail
+	keyword nojail
 }
 
 _set()

init.d.BSD/moused

@@ -16,7 +16,7 @@ depend()
 {
 	need localmount
 	after bootmisc
-	keywords nojail
+	keyword nojail
 }
 
 start()

init.d.BSD/pf

@@ -11,7 +11,7 @@ extra_started_commands="reload"
 
 depend() {
 	need localmount
-	keywords nojail
+	keyword nojail
 }
 
 start()

init.d.BSD/savecore

@@ -7,7 +7,7 @@ description="Saves a kernel dump."
 depend()
 {
 	need localmount
-	keywords nojail
+	keyword nojail
 }
 
 start()

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()

init.d.FreeBSD/devd

@@ -10,7 +10,7 @@ depend() {
 	need localmount
 	after bootmisc
 	before net.lo0
-	keywords nojail
+	keyword nojail
 }
 
 start_pre() {

init.d.FreeBSD/dumpon

@@ -6,7 +6,7 @@ description="Configures a specific kernel dump device."
 
 depend() {
 	need swap
-	keywords nojail
+	keyword nojail
 }
 
 start() {

init.d.FreeBSD/ipfw

@@ -13,7 +13,7 @@ opts="panic showstatus"
 depend() {
 	before net
 	provide firewall
-	keywords nojail
+	keyword nojail
 }
 
 ipfw() {

init.d.FreeBSD/mixer

@@ -7,7 +7,7 @@ extra_commands="restore"
 depend()
 {
 	need localmount
-	keywords nojail
+	keyword nojail
 }
 
 restore()

init.d.FreeBSD/powerd

@@ -12,7 +12,7 @@ depend()
 	need localmount
 	use logger
 	after bootmisc
-	keywords nojail
+	keyword nojail
 }
 
 start_pre()

init.d.FreeBSD/syscons

@@ -4,7 +4,7 @@
 
 depend() {
 	need localmount
-	keywords nojail
+	keyword nojail
 }
 
 start() {

init.d.Linux/clock

@@ -28,7 +28,7 @@ depend()
 	else
 		before *
 	fi
-	keywords nouml novps noxenu
+	keyword nouml novps noxenu
 }
 
 setupopts()

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()

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()

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()

init.d.Linux/sysctl

@@ -6,7 +6,7 @@ depend()
 {
 	use hostname
 	before bootmisc logger
-	keywords novps
+	keyword novps
 }
 
 start()

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()

init.d/local

@@ -7,7 +7,7 @@ description="Executes user commands in /etc/conf.d/local"
 depend()
 {
 	after *
-	keywords notimeout
+	keyword notimeout
 }
 
 start()

init.d/localmount

@@ -8,7 +8,7 @@ depend()
 {
 	need fsck
 	use modules mtab
-	keywords nojail
+	keyword nojail
 }
 
 start()

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()

init.d/root

@@ -7,7 +7,7 @@ description="Mount the root fs read/write"
 depend()
 {
 	need fsck
-	keywords nojail
+	keyword nojail
 }
 
 start()

init.d/swap

@@ -5,7 +5,7 @@
 depend()
 {
 	need localmount
-	keywords nojail
+	keyword nojail
 }
 
 start()

init.d/urandom

@@ -9,7 +9,7 @@ description="Initializes the random number generator."
 depend()
 {
 	need localmount
-	keywords nojail
+	keyword nojail
 }
 
 save_seed()

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

sh/gendepends.sh

@@ -24,8 +24,8 @@ after() {
 provide() {
 	[ -n "$*" ] && echo "${SVCNAME} iprovide $*" >&3
 }
-keywords() {
+keyword() {
-	[ -n "$*" ] && echo "${SVCNAME} keywords $*" >&3
+	[ -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}

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}

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)

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;