diff options
author | Abdoulaye Walsimou Gaye <awg@embtoolkit.org> | 2013-12-30 16:54:04 +0100 |
---|---|---|
committer | Abdoulaye Walsimou Gaye <awg@embtoolkit.org> | 2013-12-30 16:54:04 +0100 |
commit | cf468ad0fd5426c2625626eb1e8dac2c223210e7 (patch) | |
tree | 2f4041d57c1dc70311872880fc5cc39c1c387dd7 /man | |
parent | 37a57b1a4004ab89424d8881d0b33b59709e375a (diff) | |
parent | 3470eda3f5cea437a6de132b1ead3f27effd3902 (diff) | |
download | openrc-embtk-0.13.tar.gz openrc-embtk-0.13.tar.bz2 openrc-embtk-0.13.tar.xz |
Merge branch 'master' into openrc-master-embtkopenrc-embtk-0.13openrc-master-embtk
Diffstat (limited to 'man')
-rw-r--r-- | man/Makefile | 2 | ||||
-rw-r--r-- | man/openrc-run.8 (renamed from man/runscript.8) | 8 | ||||
-rw-r--r-- | man/rc-update.8 | 4 | ||||
-rw-r--r-- | man/rc_deptree.3 | 2 | ||||
-rw-r--r-- | man/rc_plugin_hook.3 | 2 | ||||
-rw-r--r-- | man/rc_service.3 | 2 |
6 files changed, 11 insertions, 9 deletions
diff --git a/man/Makefile b/man/Makefile index 04862da..436f647 100644 --- a/man/Makefile +++ b/man/Makefile @@ -1,7 +1,7 @@ MAN3= einfo.3 \ rc_config.3 rc_deptree.3 rc_find_pids.3 rc_plugin_hook.3 \ rc_runlevel.3 rc_service.3 rc_stringlist.3 -MAN8= rc-service.8 rc-status.8 rc-update.8 openrc.8 runscript.8 \ +MAN8= rc-service.8 rc-status.8 rc-update.8 openrc.8 openrc-run.8 \ service.8 start-stop-daemon.8 # Handy macro to create symlinks diff --git a/man/runscript.8 b/man/openrc-run.8 index e0d7cf0..0346241 100644 --- a/man/runscript.8 +++ b/man/openrc-run.8 @@ -22,10 +22,10 @@ .\" SUCH DAMAGE. .\" .Dd December 31, 2011 -.Dt RUNSCRIPT 8 SMM +.Dt openrc-run 8 SMM .Os OpenRC .Sh NAME -.Nm runscript +.Nm openrc-run .Nd a means of hooking shell commands into a service .Sh SYNOPSIS .Nm @@ -47,7 +47,7 @@ and finally the script itself. At this point then runs the command given. .Pp Commands are defined as shell functions within the script. Here is a list of -some functions that all runscripts have by default: +some functions that all scripts have by default: .Bl -tag -width "RC_DEFAULTLEVEL" .It Ar describe Describes what the service does and each command the service defines. @@ -411,7 +411,7 @@ rc_keyword="!-prefix" .Pp An example service script for foo. .Bd -literal -offset indent -#!/sbin/runscript +#!/sbin/openrc-run command=/usr/bin/foo command_args="${foo_args} --bar" pidfile=/var/run/foo.pid diff --git a/man/rc-update.8 b/man/rc-update.8 index 459f069..3fa97a4 100644 --- a/man/rc-update.8 +++ b/man/rc-update.8 @@ -53,7 +53,8 @@ All services must reside in the or .Pa /usr/local/etc/init.d directories. -They must also conform to the OpenRC runscript standard. +They must also be standard OpenRC scripts, meaning they must use +openrc-run. .Pp .Bl -tag -width "Fl a , -delete service" .It Ar add Ar service @@ -87,6 +88,7 @@ option is given then we either add or remove the runlevel from the runlevel. This allows inheritance of runlevels. .Sh SEE ALSO .Xr openrc 8 , +.Xr openrc-run 8 , .Xr rc-status 8 .Sh AUTHORS .An Roy Marples <roy@marples.name> diff --git a/man/rc_deptree.3 b/man/rc_deptree.3 index e980534..64fcf60 100644 --- a/man/rc_deptree.3 +++ b/man/rc_deptree.3 @@ -107,6 +107,6 @@ when done. .Xr malloc 3 , .Xr free 3 , .Xr rc_stringlist_free 3 , -.Xr runscript 8 +.Xr openrc-run 8 .Sh AUTHORS .An Roy Marples <roy@marples.name> diff --git a/man/rc_plugin_hook.3 b/man/rc_plugin_hook.3 index 22a1c58..955ecb8 100644 --- a/man/rc_plugin_hook.3 +++ b/man/rc_plugin_hook.3 @@ -45,6 +45,6 @@ Plugins can affect the parent environment by writing NULL separated strings to .Va rc_environ_fd . .Sh SEE ALSO .Xr openrc 8 , -.Xr runscript 8 +.Xr openrc-run 8 .Sh AUTHORS .An Roy Marples <roy@marples.name> diff --git a/man/rc_service.3 b/man/rc_service.3 index 4c1ee01..aba1636 100644 --- a/man/rc_service.3 +++ b/man/rc_service.3 @@ -141,7 +141,7 @@ is lost. returns a list of extra commands the .Fa service supports beyond the default ones. See -.Nm runscript +.Nm openrc-run for default commands. .Pp .Fn rc_service_plugable |