random spelling fixes
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
This commit is contained in:
Mike Frysinger
Roy Marples
parent
bb45f0eabc
commit
ecf9ef49a7
4
README
4
README
@ -41,7 +41,7 @@ If any of the following files exist then we do not overwrite them
|
||||
rc and rc.shutdown are the hooks from the BSD init into OpenRC.
|
||||
devd.conf is modified from FreeBSD to call /etc/rc.devd which is a generic
|
||||
hook into OpenRC.
|
||||
inittab is the same, but for SysVInit as used by most Linux distrubtions.
|
||||
inittab is the same, but for SysVInit as used by most Linux distributions.
|
||||
This can be found in the support folder.
|
||||
Obviously, if you're installing this onto a system that does not use OpenRC
|
||||
by default then you may wish to backup the above listed files, remove them
|
||||
@ -66,7 +66,7 @@ History - by Roy Marples
|
||||
------------------------
|
||||
I became a Gentoo/Linux developer in 2004 and wrote the modular network
|
||||
scripts for the Gentoo baselayout package. baselayout is a collection of
|
||||
bash scripts to bring up your computer and it's services.
|
||||
bash scripts to bring up your computer and its services.
|
||||
Then towards the end of 2005 I found myself as the primary maintainer
|
||||
for baselayout.
|
||||
|
||||
|
||||
@ -12,8 +12,8 @@ In the Perfect World (TM) ifconfig should be able to configure everything
|
||||
about the interface easily * . The BSD family almost get this right and Linux
|
||||
epically fails.
|
||||
|
||||
* Only static confguration, including link setup.
|
||||
For dynmaic, static, IPv4LL, arping and per ssid IPv4 setup dhcpcd-5.x
|
||||
* Only static configuration, including link setup.
|
||||
For dynamic, static, IPv4LL, arping and per ssid IPv4 setup dhcpcd-5.x
|
||||
provides your needs.
|
||||
|
||||
It fails because there are many tools to do the same job and often have
|
||||
@ -31,6 +31,6 @@ currently available. It's just harder as you have to know them and their
|
||||
documentation can be lacking at times.
|
||||
The correct end goal is a BSD style ifconfig tool.
|
||||
I've started work on it, but the project has stalled somewhat.
|
||||
It's display only right now and the source is not yet publically available.
|
||||
It's display only right now and the source is not yet publicly available.
|
||||
If you have the skills and share the vision then contact me privately and
|
||||
we'll take it from there.
|
||||
|
||||
@ -12,7 +12,7 @@
|
||||
# kernel then remove the IPv6 address from your config.
|
||||
|
||||
# If you want to use a static address or use DHCP explicitly, jump
|
||||
# down to the section labelled INTERFACE HANDLERS.
|
||||
# down to the section labeled INTERFACE HANDLERS.
|
||||
#
|
||||
# If you want to do anything more fancy, you should take the time to
|
||||
# read through the rest of this file.
|
||||
@ -22,10 +22,10 @@
|
||||
#
|
||||
# We now support modular networking scripts which means we can easily
|
||||
# add support for new interface types and modules while keeping
|
||||
# compatability with existing ones.
|
||||
# compatibility with existing ones.
|
||||
#
|
||||
# Modules load by default if the package they need is installed. If
|
||||
# you specify a module here that doesn't have it's package installed
|
||||
# you specify a module here that doesn't have its package installed
|
||||
# then you get an error stating which package you need to install.
|
||||
# Ideally, you only use the modules setting when you have two or more
|
||||
# packages installed that supply the same service.
|
||||
@ -96,8 +96,8 @@
|
||||
#modules="iwconfig"
|
||||
|
||||
# ifconfig (iwconig) support is a one shot script - wpa_supplicant is daemon
|
||||
# that scans, assoicates and re-configures if assocation is lost.
|
||||
# We call it iwconfig to seperate the wireless setup from ifconfig.
|
||||
# that scans, associates and re-configures if association is lost.
|
||||
# We call it iwconfig to separate the wireless setup from ifconfig.
|
||||
####################################
|
||||
# HINTS
|
||||
#
|
||||
@ -182,7 +182,7 @@
|
||||
#dns_servers_001122334455="192.168.0.1 192.168.0.2"
|
||||
|
||||
# Map a MAC address to an SSID
|
||||
# This is used when the Access Point is not broadcasting it's SSID
|
||||
# This is used when the Access Point is not broadcasting its SSID
|
||||
# WARNING: This will override the SSID being broadcast due to some
|
||||
# Access Points sending an SSID even when they have been configured
|
||||
# not to!
|
||||
@ -193,7 +193,7 @@
|
||||
# This lists the preferred SSIDs to connect to in order
|
||||
# SSID's can contain any characters here as they must match the broadcast
|
||||
# SSID exactly.
|
||||
# Surround each SSID with the " character and seperate them with a space
|
||||
# Surround each SSID with the " character and separate them with a space
|
||||
# If the first SSID isn't found then it moves onto the next
|
||||
# If this isn't defined then it connects to the first one found
|
||||
#preferred_aps="SSID1 SSID2"
|
||||
@ -208,9 +208,9 @@
|
||||
# any other available AP
|
||||
# "preferredonly" means it will only connect to visible APs in the preferred
|
||||
# list
|
||||
# "forcepreferred" means it will forceably connect to APs in order if it does
|
||||
# "forcepreferred" means it will forcibly connect to APs in order if it does
|
||||
# not find them in a scan
|
||||
# "forcepreferredonly" means it forceably connects to the APs in order and
|
||||
# "forcepreferredonly" means it forcibly connects to the APs in order and
|
||||
# does not bother to scan
|
||||
# "forceany" does the same as forcepreferred + connects to any other
|
||||
# available AP
|
||||
@ -320,7 +320,7 @@
|
||||
# Set generic DHCP options like so
|
||||
#dhcp_eth0="release nodns nontp nonis nogateway nosendhost"
|
||||
|
||||
# This tells the dhcp client to release it's lease when it stops, not to
|
||||
# This tells the dhcp client to release its lease when it stops, not to
|
||||
# overwrite dns, ntp and nis settings, not to set a default route and not to
|
||||
# send the current hostname to the dhcp server and when it starts.
|
||||
# You can use any combination of the above options - the default is not to
|
||||
|
||||
@ -12,7 +12,7 @@
|
||||
# kernel then remove the IPv6 address from your config.
|
||||
|
||||
# If you want to use a static address or use DHCP explicitly, jump
|
||||
# down to the section labelled INTERFACE HANDLERS.
|
||||
# down to the section labeled INTERFACE HANDLERS.
|
||||
#
|
||||
# If you want to do anything more fancy, you should take the time to
|
||||
# read through the rest of this file.
|
||||
@ -23,10 +23,10 @@
|
||||
#
|
||||
# We now support modular networking scripts which means we can easily
|
||||
# add support for new interface types and modules while keeping
|
||||
# compatability with existing ones.
|
||||
# compatibility with existing ones.
|
||||
#
|
||||
# Modules load by default if the package they need is installed. If
|
||||
# you specify a module here that doesn't have it's package installed
|
||||
# you specify a module here that doesn't have its package installed
|
||||
# then you get an error stating which package you need to install.
|
||||
# Ideally, you only use the modules setting when you have two or more
|
||||
# packages installed that supply the same service.
|
||||
@ -106,7 +106,7 @@
|
||||
|
||||
# Each module described below can set a default base metric, lower is
|
||||
# preferred over higher. This is so we can prefer a wired route over a
|
||||
# wireless route automaticaly. You can override this by setting
|
||||
# wireless route automatically. You can override this by setting
|
||||
#metric_eth0="100"
|
||||
# or on a global basis
|
||||
#metric="100"
|
||||
@ -253,7 +253,7 @@
|
||||
#key_SSID="s:foobar enc open"
|
||||
#key_SSID="1234-5678-9012 enc open"
|
||||
|
||||
# You may want to set muliple keys - here's an example
|
||||
# You may want to set multiple keys - here's an example
|
||||
# It sets 4 keys on the card and instructs to use key 2 by default
|
||||
#key_SSID="[1] s:passkey1 key [2] s:passkey2 key [3] s:passkey3 key [4] s:passkey4 key [2]"
|
||||
|
||||
@ -283,7 +283,7 @@
|
||||
#dns_servers_001122334455="192.168.0.1 192.168.0.2"
|
||||
|
||||
# Map a MAC address to an SSID
|
||||
# This is used when the Access Point is not broadcasting it's SSID
|
||||
# This is used when the Access Point is not broadcasting its SSID
|
||||
# WARNING: This will override the SSID being broadcast due to some
|
||||
# Access Points sending an SSID even when they have been configured
|
||||
# not to!
|
||||
@ -294,7 +294,7 @@
|
||||
# This lists the preferred SSIDs to connect to in order
|
||||
# SSID's can contain any characters here as they must match the broadcast
|
||||
# SSID exactly.
|
||||
# Surround each SSID with the " character and seperate them with a space
|
||||
# Surround each SSID with the " character and separate them with a space
|
||||
# If the first SSID isn't found then it moves onto the next
|
||||
# If this isn't defined then it connects to the first one found
|
||||
#preferred_aps="SSID1 SSID2"
|
||||
@ -307,9 +307,9 @@
|
||||
# "any" means it will connect to visible APs in the preferred list and then any
|
||||
# other available AP
|
||||
# "preferredonly" means it will only connect to visible APs in the preferred list
|
||||
# "forcepreferred" means it will forceably connect to APs in order if it does not find
|
||||
# "forcepreferred" means it will forcibly connect to APs in order if it does not find
|
||||
# them in a scan
|
||||
# "forcepreferredonly" means it forceably connects to the APs in order and does not bother
|
||||
# "forcepreferredonly" means it forcibly connects to the APs in order and does not bother
|
||||
# to scan
|
||||
# "forceany" does the same as forcepreferred + connects to any other available AP
|
||||
# Default is "any"
|
||||
@ -448,7 +448,7 @@
|
||||
# Set generic DHCP options like so
|
||||
#dhcp_eth0="release nodns nontp nonis nogateway nosendhost"
|
||||
|
||||
# This tells the dhcp client to release it's lease when it stops, not to
|
||||
# This tells the dhcp client to release its lease when it stops, not to
|
||||
# overwrite dns, ntp and nis settings, not to set a default route and not to
|
||||
# send the current hostname to the dhcp server and when it starts.
|
||||
# You can use any combination of the above options - the default is not to
|
||||
@ -572,7 +572,7 @@
|
||||
#config_bond0="null" # You may not want to assign an IP the the bond
|
||||
|
||||
# You can also configure the bond here, which must be done via sysfs on 2.6
|
||||
# kernels or newer. See the kernel bonding documention for a description of
|
||||
# kernels or newer. See the kernel bonding documentation for a description of
|
||||
# these options.
|
||||
#arp_ip_target_bond0="+26.0.0.0"
|
||||
|
||||
@ -658,7 +658,7 @@
|
||||
#
|
||||
# Dead peer detection
|
||||
# lcp-echo-interval 15 # Send a LCP echo every 15 seconds
|
||||
# lcp-echo-failure 3 # Make peer dead after 3 consective
|
||||
# lcp-echo-failure 3 # Make peer dead after 3 consecutive
|
||||
# # echo-requests
|
||||
#
|
||||
# Compression options - use these to completely disable compression
|
||||
@ -822,8 +822,8 @@
|
||||
#config_nas0="'192.168.0.1/24'"
|
||||
|
||||
#-----------------------------------------------------------------------------
|
||||
# Tunnelling
|
||||
# WARNING: For tunnelling it is highly recommended that you
|
||||
# Tunneling
|
||||
# WARNING: For tunneling it is highly recommended that you
|
||||
# emerge sys-apps/iproute2
|
||||
#
|
||||
# For GRE tunnels
|
||||
@ -838,7 +838,7 @@
|
||||
|
||||
# 6to4 Tunnels allow IPv6 to work over IPv4 addresses, provided you
|
||||
# have a non-private address configured on an interface.
|
||||
# link_6to4="eth0" # Interface to base it's addresses on
|
||||
# link_6to4="eth0" # Interface to base its addresses on
|
||||
# config_6to4="ip6to4"
|
||||
# You may want to depend on eth0 like so
|
||||
#rc_need_6to4="net.eth0"
|
||||
@ -848,7 +848,7 @@
|
||||
# sit0 - otherwise use a different name like 6to4 in the example above.
|
||||
|
||||
# You can also specify a relay and suffix if you like.
|
||||
# The default relay is 192.88.99.1 and the defualt suffix is :1
|
||||
# The default relay is 192.88.99.1 and the default suffix is :1
|
||||
#relay_6to4="192.168.3.2"
|
||||
#suffix_6to4=":ff"
|
||||
|
||||
|
||||
@ -2,7 +2,7 @@
|
||||
|
||||
# Set to "YES" if you want the rc system to try and start services
|
||||
# in parallel for a slight speed improvement. When running in parallel we
|
||||
# prefix the service output with it's name as the output will get
|
||||
# prefix the service output with its name as the output will get
|
||||
# jumbled up.
|
||||
# WARNING: whilst we have improved parallel, it can still potentially lock
|
||||
# the boot process. Don't file bugs about this unless you can supply
|
||||
|
||||
@ -13,7 +13,7 @@ depend()
|
||||
|
||||
start()
|
||||
{
|
||||
# Make sure we insert usbcore if its a module
|
||||
# Make sure we insert usbcore if it's a module
|
||||
if [ -f /proc/modules -a ! -d /proc/bus/usb ]; then
|
||||
modprobe -q usbcore
|
||||
fi
|
||||
|
||||
@ -39,7 +39,7 @@
|
||||
.Nm eprefix
|
||||
.Nd colorful informational output
|
||||
.Sh LIBRARY
|
||||
Enhanced Informatation output library (libeinfo, -leinfo)
|
||||
Enhanced Information output library (libeinfo, -leinfo)
|
||||
.Sh SYNOPSIS
|
||||
.In einfo.h
|
||||
.Ft int Fn einfo "const char * restrict format" ...
|
||||
|
||||
@ -36,7 +36,7 @@
|
||||
.Nm
|
||||
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 unassgined services that are not stopped,
|
||||
about the current runlevel and any unassigned services that are not stopped,
|
||||
but any runlevel can be quickly examined.
|
||||
.Pp
|
||||
The options are as follows:
|
||||
|
||||
@ -54,7 +54,7 @@ owned by
|
||||
.Fa uid ,
|
||||
all of which are optional.
|
||||
.Pp
|
||||
The retuned list should be freed when done.
|
||||
The returned list should be freed when done.
|
||||
.Sh IMPLEMENTATION NOTES
|
||||
On BSD systems we use
|
||||
.Lb libkvm
|
||||
|
||||
@ -42,7 +42,7 @@ is set to the hook running, and
|
||||
.Fa name
|
||||
is set to the name of the runlevel or name of the service.
|
||||
.Pp
|
||||
Plugins can affect the parent environemnt by writing NULL separated strings to
|
||||
Plugins can affect the parent environment by writing NULL separated strings to
|
||||
.Va rc_environ_fd .
|
||||
.Sh SEE ALSO
|
||||
.Xr rc 8 ,
|
||||
|
||||
@ -39,8 +39,8 @@
|
||||
.Nm
|
||||
is basically an interpreter for shell scripts which provide an easy interface
|
||||
to the often complex system commands and daemons.
|
||||
When a service runs a command it first loads it's mulitplexed configuration
|
||||
file, then it's master configuration file, then
|
||||
When a service runs a command it first loads its multiplexed configuration
|
||||
file, then its master configuration file, then
|
||||
.Pa /etc/rc.conf
|
||||
and finally the script itself. At this point
|
||||
.Nm
|
||||
@ -79,7 +79,7 @@ Ignore all dependency information the service supplies.
|
||||
Only run the command if the service has been started.
|
||||
.It Fl q , -quiet
|
||||
Turns off all informational output the service generates.
|
||||
Output from any non OpenRC comands is not affected.
|
||||
Output from any non OpenRC commands is not affected.
|
||||
.It Fl v , -verbose
|
||||
Turns on any extra informational output the service generates.
|
||||
.It Fl Z , -dry-run
|
||||
@ -90,9 +90,9 @@ or stopping them.
|
||||
The following variables affect the service script:
|
||||
.Bl -tag -width "RC_DEFAULTLEVEL"
|
||||
.It Ar extra_commands
|
||||
Space seperated list of extra commands the service defines.
|
||||
Space separated list of extra commands the service defines.
|
||||
.It Ar extra_started_commands
|
||||
Space seperated list of extra commands the service defines. These only work if
|
||||
Space separated list of extra commands the service defines. These only work if
|
||||
the service has already been started.
|
||||
.It Ar description
|
||||
String describing the service.
|
||||
@ -128,7 +128,7 @@ will refuse to stop until any services that need it have stopped.
|
||||
The service will attempt to start any services we use that have been added
|
||||
to the runlevel.
|
||||
.It Ic after
|
||||
The service will start after thse services and stop before these services.
|
||||
The service will start after these services and stop before these services.
|
||||
.It Ic before
|
||||
The service will start before these services and stop after these services.
|
||||
.It Ic provide
|
||||
@ -225,7 +225,7 @@ is newer than
|
||||
return 0, otherwise 1.
|
||||
If
|
||||
.Ar file2
|
||||
is a directory, then check all it's contents too.
|
||||
is a directory, then check all its contents too.
|
||||
.It Ic is_older_than Ar file1 Ar file2 ...
|
||||
If
|
||||
.Ar file1
|
||||
@ -234,7 +234,7 @@ is newer than
|
||||
return 0, otherwise 1.
|
||||
If
|
||||
.Ar file2
|
||||
is a directory, then check all it's contents too.
|
||||
is a directory, then check all its contents too.
|
||||
.It Ic service_set_value Ar name Ar value
|
||||
Saves the
|
||||
.Ar name
|
||||
@ -320,7 +320,7 @@ Configuration files, relative to the location of the service.
|
||||
If a file ending with .${RC_RUNLEVEL} exists then we use that instead.
|
||||
.Bl -ohang
|
||||
.It Pa ../conf.d/${RC_SVCNAME%%.*}
|
||||
mulitplexed configuration file.
|
||||
multiplexed configuration file.
|
||||
Example: if ${RC_SVCNAME} is net.eth1 then look for
|
||||
.Pa ../conf.d/net .
|
||||
.It Pa ../conf.d/${RC_SVCNAME}
|
||||
|
||||
@ -43,7 +43,7 @@
|
||||
.Ar daemon
|
||||
.Sh DESCRIPTION
|
||||
.Nm
|
||||
provides a consistent method of starting, stopping and signalling daemons.
|
||||
provides a consistent method of starting, stopping and signaling daemons.
|
||||
If neither
|
||||
.Fl K , -stop
|
||||
nor
|
||||
@ -85,7 +85,7 @@ then
|
||||
.Nm
|
||||
matches the process
|
||||
.D1 /usr/bin/perl -w foo
|
||||
If an interpreted daemon changes it's process name then this won't work.
|
||||
If an interpreted daemon changes its process name then this won't work.
|
||||
.It Fl u , -user Ar user Ns Op : Ns Ar group
|
||||
Start the daemon as the
|
||||
.Ar user
|
||||
|
||||
@ -26,7 +26,7 @@ tuntap_pre_start()
|
||||
return 1
|
||||
fi
|
||||
vebegin "Waiting for /dev/net/tun"
|
||||
# /dev/net/tun can take it's time to appear
|
||||
# /dev/net/tun can take its time to appear
|
||||
local timeout=10
|
||||
while [ ! -e /dev/net/tun -a ${timeout} -gt 0 ]; do
|
||||
sleep 1
|
||||
|
||||
@ -377,7 +377,7 @@ rc_runlevel_stacks(const char *runlevel)
|
||||
}
|
||||
librc_hidden_def(rc_runlevel_stacks)
|
||||
|
||||
/* Resolve a service name to it's full path */
|
||||
/* Resolve a service name to its full path */
|
||||
char *
|
||||
rc_service_resolve(const char *service)
|
||||
{
|
||||
|
||||
@ -117,7 +117,7 @@ bool rc_runlevel_stopping(void);
|
||||
|
||||
/*! @name RC
|
||||
* A service can be given as a full path or just its name.
|
||||
* If its just a name then we try to resolve the service to a full path.
|
||||
* If it's just a name then we try to resolve the service to a full path.
|
||||
* This should allow the use if local init.d directories in the future. */
|
||||
|
||||
/*! @brief States a service can be in */
|
||||
@ -326,7 +326,7 @@ typedef void *RC_DEPTREE;
|
||||
#endif
|
||||
|
||||
/*! Check to see if source is newer than target.
|
||||
* If target is a directory then we traverse it and it's children.
|
||||
* If target is a directory then we traverse it and its children.
|
||||
* @param source
|
||||
* @param target
|
||||
* @param mtime of newest target
|
||||
@ -335,7 +335,7 @@ typedef void *RC_DEPTREE;
|
||||
bool rc_newer_than(const char *, const char *, time_t *, char *);
|
||||
|
||||
/*! Check to see if source is older than target.
|
||||
* If target is a directory then we traverse it and it's children.
|
||||
* If target is a directory then we traverse it and its children.
|
||||
* @param source
|
||||
* @param target
|
||||
* @param mtime of oldest target
|
||||
@ -446,7 +446,7 @@ RC_STRINGLIST *rc_config_load(const char *);
|
||||
/*! Return the value of the entry from a key=value list. */
|
||||
char *rc_config_value(RC_STRINGLIST *, const char *);
|
||||
|
||||
/*! Check if a variable is a boolean and return it's value.
|
||||
/*! Check if a variable is a boolean and return its value.
|
||||
* If variable is not a boolean then we set errno to be ENOENT when it does
|
||||
* not exist or EINVAL if it's not a boolean.
|
||||
* @param variable to check
|
||||
@ -485,9 +485,9 @@ bool rc_stringlist_delete(RC_STRINGLIST *, const char *);
|
||||
* @return pointer to item */
|
||||
RC_STRING *rc_stringlist_find(RC_STRINGLIST *, const char *);
|
||||
|
||||
/*! Split a string into a stringlist based on seperator.
|
||||
/*! Split a string into a stringlist based on separator.
|
||||
* @param string to split
|
||||
* @param seperator
|
||||
* @param separator
|
||||
* @return new list */
|
||||
RC_STRINGLIST *rc_stringlist_split(const char *, const char *);
|
||||
|
||||
|
||||
@ -38,7 +38,7 @@
|
||||
#include <string.h>
|
||||
#include <unistd.h>
|
||||
|
||||
/* Yay for linux and it's non liking of POSIX functions.
|
||||
/* Yay for linux and its non liking of POSIX functions.
|
||||
Okay, we could use getfsent but the man page says use getmntent instead
|
||||
AND we don't have getfsent on uclibc or dietlibc for some odd reason. */
|
||||
#ifdef __linux__
|
||||
|
||||
@ -467,7 +467,7 @@ run_applets(int argc, char **argv)
|
||||
}
|
||||
exit(EXIT_FAILURE);
|
||||
};
|
||||
/* This tets is correct as it's not present in baselayout */
|
||||
/* This test is correct as it's not present in baselayout */
|
||||
if (strcmp(applet, "is_newer_than") == 0) {
|
||||
if (argc < 3)
|
||||
exit (EXIT_FAILURE);
|
||||
|
||||
@ -998,7 +998,7 @@ svc_restart(void)
|
||||
* dns via resolvconf, so you could have openvpn trying to restart
|
||||
* dnsmasq which in turn is waiting on net which in turn is waiting
|
||||
* on dnsmasq.
|
||||
* The work around is for resolvconf to restart it's services with
|
||||
* The work around is for resolvconf to restart its services with
|
||||
* --nodeps which means just that.
|
||||
* The downside is that there is a small window when our status is
|
||||
* invalid.
|
||||
@ -1106,7 +1106,7 @@ runscript(int argc, char **argv)
|
||||
atexit(cleanup);
|
||||
|
||||
/* We need to work out the real full path to our service.
|
||||
* This works fine, provided that we ONLY allow mulitplexed services
|
||||
* This works fine, provided that we ONLY allow multiplexed services
|
||||
* to exist in the same directory as the master link.
|
||||
* Also, the master link as to be a real file in the init dir. */
|
||||
if (!realpath(argv[1], path)) {
|
||||
@ -1192,7 +1192,7 @@ runscript(int argc, char **argv)
|
||||
|
||||
deps = true;
|
||||
|
||||
/* Punt the first arg as it's our service name */
|
||||
/* Punt the first arg as its our service name */
|
||||
argc--;
|
||||
argv++;
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user