diff options
| -rw-r--r-- | TODO | 2 | ||||
| -rw-r--r-- | conf.d/adjkerntz | 6 | ||||
| -rw-r--r-- | conf.d/hwclock | 8 | ||||
| -rw-r--r-- | conf.d/keymaps | 2 | ||||
| -rw-r--r-- | conf.d/moused | 2 | ||||
| -rw-r--r-- | man/Makefile | 2 | ||||
| -rw-r--r-- | man/einfo.3 | 4 | ||||
| -rw-r--r-- | man/rc-service.8 | 4 | ||||
| -rw-r--r-- | man/rc-status.8 | 4 | ||||
| -rw-r--r-- | man/rc-update.8 | 4 | ||||
| -rw-r--r-- | man/rc_deptree.3 | 4 | ||||
| -rw-r--r-- | man/rc_runlevel.3 | 2 | ||||
| -rw-r--r-- | man/rc_service.3 | 2 | ||||
| -rw-r--r-- | man/rc_stringlist.3 | 2 | ||||
| -rw-r--r-- | man/runscript.8 | 14 | ||||
| -rw-r--r-- | man/start-stop-daemon.8 | 2 | ||||
| -rw-r--r-- | mk/scripts.mk | 2 | ||||
| -rw-r--r-- | mk/subdir.mk | 2 | ||||
| -rw-r--r-- | mk/sys.mk | 4 | ||||
| -rw-r--r-- | support/sysvinit/inittab | 2 |
20 files changed, 37 insertions, 37 deletions
@@ -1,4 +1,4 @@ -- ensure all forks block, restore and unblock signals. needs review +- ensure all forks block, restore and unblock signals. needs review - add support somehow for optional translations diff --git a/conf.d/adjkerntz b/conf.d/adjkerntz index 4dab74f..b7291cd 100644 --- a/conf.d/adjkerntz +++ b/conf.d/adjkerntz @@ -1,10 +1,10 @@ # Set CLOCK to "UTC" if your system clock is set to UTC (also known as -# Greenwich Mean Time). If your clock is set to the local time, then -# set CLOCK to "local". Note that if you dual boot with Windows, then +# Greenwich Mean Time). If your clock is set to the local time, then +# set CLOCK to "local". Note that if you dual boot with Windows, then # you should set it to "local". clock="UTC" -# If you want to set the Hardware Clock to the current System Time +# If you want to set the Hardware Clock to the current System Time # during shutdown, then say "YES" here. # You normally don't need to do this if you run a ntp daemon. clock_systohc="NO" diff --git a/conf.d/hwclock b/conf.d/hwclock index 4e66ff9..a94cdb2 100644 --- a/conf.d/hwclock +++ b/conf.d/hwclock @@ -1,10 +1,10 @@ # Set CLOCK to "UTC" if your Hardware Clock is set to UTC (also known as -# Greenwich Mean Time). If that clock is set to the local time, then -# set CLOCK to "local". Note that if you dual boot with Windows, then +# Greenwich Mean Time). If that clock is set to the local time, then +# set CLOCK to "local". Note that if you dual boot with Windows, then # you should set it to "local". clock="UTC" -# If you want to set the Hardware Clock to the current System Time +# If you want to set the Hardware Clock to the current System Time # (software clock) during shutdown, then say "YES" here. # You normally don't need to do this if you run a ntp daemon. clock_systohc="NO" @@ -16,7 +16,7 @@ clock_systohc="NO" # never be saved to the hardware clock unless you set # clock_systohc="YES" above. clock_hctosys="YES" - + # If you wish to pass any other arguments to hwclock during bootup, # you may do so here. Alpha users may wish to use --arc or --srm here. clock_args="" diff --git a/conf.d/keymaps b/conf.d/keymaps index 1a5b944..f2431de 100644 --- a/conf.d/keymaps +++ b/conf.d/keymaps @@ -12,7 +12,7 @@ windowkeys="NO" extended_keymaps="" #extended_keymaps="backspace keypad euro2" -# Tell dumpkeys(1) to interpret character action codes to be +# Tell dumpkeys(1) to interpret character action codes to be # from the specified character set. # This only matters if you set unicode="yes" in /etc/rc.conf. # For a list of valid sets, run `dumpkeys --help` diff --git a/conf.d/moused b/conf.d/moused index a9d2d40..2d9bf77 100644 --- a/conf.d/moused +++ b/conf.d/moused @@ -11,6 +11,6 @@ # You can also multiplex the init script for each device like so # ln -s moused /etc/init.d/moused.ums0 -# This enables you to have a config file per mouse (forces moused_device +# This enables you to have a config file per mouse (forces moused_device # to ums0 in this case) and control each mouse. # devd can also start and stop these mice, which laptop users will find handy. diff --git a/man/Makefile b/man/Makefile index 5a63da8..3ad717d 100644 --- a/man/Makefile +++ b/man/Makefile @@ -27,7 +27,7 @@ install: for man in ${MAN3}; do \ ${INSTALL} -m ${MANMODE} "$$man" ${DESTDIR}/${MANDIR}/man3 || exit $$?; \ ${MAKE_LINKS} \ - done + done ${INSTALL} -d ${DESTDIR}/${MANDIR}/man8 for man in ${MAN8}; do \ ${INSTALL} -m ${MANMODE} "$$man" ${DESTDIR}/${MANDIR}/man8 || exit $$?; \ diff --git a/man/einfo.3 b/man/einfo.3 index 5dc86d0..f613df3 100644 --- a/man/einfo.3 +++ b/man/einfo.3 @@ -115,7 +115,7 @@ to true. These functions are designed to output a whole line, so they also append a newline to the string. To stop this behaviour, you can use the functions -.Fn einfon , +.Fn einfon , .Fn ewarnn , .Fn eerrorn , .Fn einfovn , @@ -149,7 +149,7 @@ does the same as .Fn eend but prints .Fa msg -instead of ok or !! in the color +instead of ok or !! in the color .Fa color at the column .Fa col . diff --git a/man/rc-service.8 b/man/rc-service.8 index 31829fe..c40c747 100644 --- a/man/rc-service.8 +++ b/man/rc-service.8 @@ -26,7 +26,7 @@ .Os OpenRC .Sh NAME .Nm rc-service -.Nd locate and run an OpenRC service with the given arguments +.Nd locate and run an OpenRC service with the given arguments .Sh SYNOPSIS .Nm .Op Fl i , -ifexists @@ -41,7 +41,7 @@ .Fl r , -resolve .Ar service .Sh DESCRIPTION -Service scripts could be in different places on different systems. +Service scripts could be in different places on different systems. .Nm locates the specified service and runs it with the given arguments. If diff --git a/man/rc-status.8 b/man/rc-status.8 index 55877ba..4b786a6 100644 --- a/man/rc-status.8 +++ b/man/rc-status.8 @@ -33,8 +33,8 @@ .Op Ar runlevel .Sh DESCRIPTION .Nm -gathers and displays information about the status of services -in different runlevels. The default behavior is to show information +gathers and displays information about the status of services +in different runlevels. The default behavior is to show information about the current runlevel and any unassigned services that are not stopped, but any runlevel can be quickly examined. .Pp diff --git a/man/rc-update.8 b/man/rc-update.8 index 829f653..088b5fe 100644 --- a/man/rc-update.8 +++ b/man/rc-update.8 @@ -26,7 +26,7 @@ .Os OpenRC .Sh NAME .Nm rc-update -.Nd add and remove services to and from a runlevel +.Nd add and remove services to and from a runlevel .Sh SYNOPSIS .Nm .Op Fl s , -stack @@ -44,7 +44,7 @@ .Ar show .Op Ar runlevel ... .Sh DESCRIPTION -OpenRC uses named runlevels. Rather than editing some obscure +OpenRC uses named runlevels. Rather than editing some obscure file or managing a directory of symlinks, .Nm exists to quickly add or delete services to and from from different runlevels. diff --git a/man/rc_deptree.3 b/man/rc_deptree.3 index 69b1218..e980534 100644 --- a/man/rc_deptree.3 +++ b/man/rc_deptree.3 @@ -32,7 +32,7 @@ .Sh LIBRARY Run Command library (librc, -lrc) .Sh SYNOPSIS -.In rc.h +.In rc.h .Ft bool Fn rc_deptree_update void .Ft bool Fn rc_deptree_update_needed void .Ft RC_DEPTREE Fn rc_deptree_load void @@ -77,7 +77,7 @@ loads the deptree and returns a pointer to it which needs to be freed by when done. .Pp .Fn rc_deptree_depend , -.Fn rc_deptree_depends +.Fn rc_deptree_depends and .Fn rc_deptree_order return a list of services from the diff --git a/man/rc_runlevel.3 b/man/rc_runlevel.3 index e44a713..60468eb 100644 --- a/man/rc_runlevel.3 +++ b/man/rc_runlevel.3 @@ -31,7 +31,7 @@ .Sh LIBRARY Run Command library (librc, -lrc) .Sh SYNOPSIS -.In rc.h +.In rc.h .Ft "char *" Fn rc_runlevel_get void .Ft bool Fn rc_runlevel_exists .Ft "RC_STRINGLIST *" Fn rc_runlevel_list void diff --git a/man/rc_service.3 b/man/rc_service.3 index 9460c36..4c1ee01 100644 --- a/man/rc_service.3 +++ b/man/rc_service.3 @@ -37,7 +37,7 @@ .Sh LIBRARY Run Command library (librc, -lrc) .Sh SYNOPSIS -.In rc.h +.In rc.h .Ft bool Fn rc_service_add "const char *runlevel" "const char *service" .Ft bool Fn rc_service_delete "const char *runlevel" "const char *service" .Ft bool Fo rc_service_daemon_set diff --git a/man/rc_stringlist.3 b/man/rc_stringlist.3 index 40cac3c..bfc99fb 100644 --- a/man/rc_stringlist.3 +++ b/man/rc_stringlist.3 @@ -32,7 +32,7 @@ Run Command library (librc, -lrc) .Sh SYNOPSIS .In rc.h -.Ft "RC_STRINGLIST *" Fn rc_stringlist_new void +.Ft "RC_STRINGLIST *" Fn rc_stringlist_new void .Ft "RC_STRING *" Fn rc_stringlist_add "RC_STRINGLIST *list" "const char *item" .Ft "RC_STRING *" Fn rc_stringlist_addu "RC_STRINGLIST *list" "const char *item" .Ft bool Fn rc_stringlist_delete RC_STRINGLIST "const char *item" diff --git a/man/runscript.8 b/man/runscript.8 index dd934c4..30fde94 100644 --- a/man/runscript.8 +++ b/man/runscript.8 @@ -25,7 +25,7 @@ .Dt RUNSCRIPT 8 SMM .Os OpenRC .Sh NAME -.Nm runscript +.Nm runscript .Nd a means of hooking shell commands into a service .Sh SYNOPSIS .Nm @@ -135,7 +135,7 @@ Here is a list of the functions you can use in a .Ic depend function. You simply pass the names of the services to it to add to that dependency type, or prefix it with ! to remove it. -.Bl -tag -width "RC_DEFAULTLEVEL" +.Bl -tag -width "RC_DEFAULTLEVEL" .It Ic need The service will refuse to start until needed services have started and it will refuse to stop until any services that need it have stopped. @@ -167,9 +167,9 @@ Other services should wait indefinitely for this service to start. Use this keyword if your service may take longer than 60 seconds to start. .It Dv -jail When in a jail, exclude this service from any dependencies. The service can -still be run directly. Set via -.Ic rc_sys -in +still be run directly. Set via +.Ic rc_sys +in .Pa /etc/rc.conf .It Dv -lxc Same as -jail, but for Linux Resource Containers (LXC). @@ -323,7 +323,7 @@ matches YES, TRUE, ON or 1 regardless of case then we return 0, otherwise 1. .Sh ENVIRONMENT .Nm sets the following environment variables for use in the service scripts: -.Bl -tag -width "RC_DEFAULTLEVEL" +.Bl -tag -width "RC_DEFAULTLEVEL" .It Va RC_SVCNAME Name of the service. .It Va RC_RUNLEVEL @@ -418,7 +418,7 @@ depend() _need=`service_get_value need` else if _need_dbus; then - _need="${_need} dbus" + _need="${_need} dbus" fi fi need ${_need} diff --git a/man/start-stop-daemon.8 b/man/start-stop-daemon.8 index 5467ec2..a805232 100644 --- a/man/start-stop-daemon.8 +++ b/man/start-stop-daemon.8 @@ -58,7 +58,7 @@ is used in an OpenRC service, then OpenRC can in turn check to see if the daemon is still running. If not, then the service is marked as crashed. .Pp Here are the options to specify the daemon and how it should start or stop: -.Bl -tag -width indent +.Bl -tag -width indent .It Fl x , -exec Ar daemon The .Ar daemon diff --git a/mk/scripts.mk b/mk/scripts.mk index c0b44db..7528c27 100644 --- a/mk/scripts.mk +++ b/mk/scripts.mk @@ -53,6 +53,6 @@ check test:: # so we ensure that it has a bogus argument CLEANFILES+= ${OBJS} clean: - @if test -n "${CLEANFILES}"; then echo "rm -f ${CLEANFILES}"; rm -f ${CLEANFILES}; fi + @if test -n "${CLEANFILES}"; then echo "rm -f ${CLEANFILES}"; rm -f ${CLEANFILES}; fi include ${MK}/gitignore.mk diff --git a/mk/subdir.mk b/mk/subdir.mk index a5f05b8..7f198f8 100644 --- a/mk/subdir.mk +++ b/mk/subdir.mk @@ -4,7 +4,7 @@ # Released under the 2-clause BSD license. _+_ ?= + -ECHODIR ?= echo +ECHODIR ?= echo _SUBDIR = @${_+_}for x in ${SUBDIR}; do \ if test -d $$x; then \ ${ECHODIR} "===> ${DIRPRFX}$$x (${@:realinstall=install})"; \ @@ -10,7 +10,7 @@ RANLIB?= ranlib SED?= sed SH= /bin/sh -PREFIX?= +PREFIX?= _UPREFIX_SH= case "${PREFIX}" in "") echo /usr;; *) echo "${PREFIX}";; esac _UPREFIX:= $(shell ${_UPREFIX_SH}) UPREFIX= ${_UPREFIX} @@ -43,6 +43,6 @@ MANDIR?= ${MANPREFIX}/man MANMODE?= 0444 DOCDIR?= ${UPREFIX}/share/doc -DOCMODE?= 0644 +DOCMODE?= 0644 CONFMODE?= 0644 diff --git a/support/sysvinit/inittab b/support/sysvinit/inittab index b8c9476..3481008 100644 --- a/support/sysvinit/inittab +++ b/support/sysvinit/inittab @@ -10,7 +10,7 @@ si::sysinit:/sbin/rc sysinit # Further system initialization, brings up the boot runlevel. rc::bootwait:/sbin/rc boot -l0:0:wait:/sbin/rc shutdown +l0:0:wait:/sbin/rc shutdown l0s:0:wait:/sbin/halt -dhip l1:S1:wait:/sbin/rc single l2:2:wait:/sbin/rc nonetwork |