From 8b6e5e93c2b892166fe2d9ff4558a44391cf4842 Mon Sep 17 00:00:00 2001 From: "Anna (navi) Figueiredo Gomes" Date: Fri, 4 Apr 2025 00:30:01 +0200 Subject: [PATCH] *: fix some typos a few matches were not typos (e.g. ahd), or not changes i'd care to make (e.g. bootup vs boot up). Closes: https://github.com/OpenRC/openrc/issues/812 --- NEWS.md | 6 +++--- src/libeinfo/libeinfo.c | 2 +- src/librc/librc-depend.c | 4 ++-- src/librc/rc.h.in | 2 +- src/openrc-run/openrc-run.c | 2 +- src/openrc-user/openrc-user.c | 2 +- src/shared/selinux.c | 2 +- src/start-stop-daemon/start-stop-daemon.c | 2 +- support/openvpn/down.sh | 4 ++-- support/openvpn/up.sh | 4 ++-- 10 files changed, 15 insertions(+), 15 deletions(-) diff --git a/NEWS.md b/NEWS.md index 8f7f4dc5..e2a29546 100644 --- a/NEWS.md +++ b/NEWS.md @@ -31,7 +31,7 @@ RC_ULIMIT now supports setting multiple limits at once. OpenRC now supports shared mounts in fstab. This is used for some containers which might require hierarchies to be mounted with different -propegation than the kernel default of private. +propagation than the kernel default of private. Podman containers now can be autodetected. @@ -73,7 +73,7 @@ This benefits users since it will assign each service to its own cgroup, making resource nanagement better over all. OUTPUT_LOGGER and ERROR_LOGGER have been implemented for -supervise-daemon. For mor einformation on these settings, please check +supervise-daemon. For more information on these settings, please check the man page. ## OpenRC 0.50 @@ -225,7 +225,7 @@ information: https://github.com/openrc/openrc/issues/238 -This version adds timed shutdown and cancelation of shutdown to +This version adds timed shutdown and cancellation of shutdown to openrc-shutdown. Shutdowns can now be delayed for a certain amount of time or scheduled for an exact time. diff --git a/src/libeinfo/libeinfo.c b/src/libeinfo/libeinfo.c index 0d883507..b2f7d66e 100644 --- a/src/libeinfo/libeinfo.c +++ b/src/libeinfo/libeinfo.c @@ -31,7 +31,7 @@ #include "einfo.h" #include "helpers.h" -/* Incase we cannot work out how many columns from ioctl, supply a default */ +/* In case we cannot work out how many columns from ioctl, supply a default */ #define DEFAULT_COLS 80 #define OK "ok" diff --git a/src/librc/librc-depend.c b/src/librc/librc-depend.c index ee6c056e..cf3211cb 100644 --- a/src/librc/librc-depend.c +++ b/src/librc/librc-depend.c @@ -293,11 +293,11 @@ get_provided1(const char *runlevel, RC_STRINGLIST *providers, /* Work out if a service is provided by another service. For example metalog provides logger. We need to be able to handle syslogd providing logger too. - We do this by checking whats running, then what's starting/stopping, + We do this by checking what's running, then what's starting/stopping, then what's run in the runlevels and finally alphabetical order. If there are any bugs in rc-depend, they will probably be here as - provided dependancy can change depending on runlevel state. + provided dependency can change depending on runlevel state. */ static RC_STRINGLIST * get_provided(const RC_DEPINFO *depinfo, const char *runlevel, int options) diff --git a/src/librc/rc.h.in b/src/librc/rc.h.in index 301e4134..82bbdb91 100644 --- a/src/librc/rc.h.in +++ b/src/librc/rc.h.in @@ -55,7 +55,7 @@ extern "C" { #endif /* LOCAL_PREFIX is for user written stuff, which the base OS and package - * manger don't touch. */ + * manager don't touch. */ #define RC_LOCAL_PREFIX "@LOCAL_PREFIX@" #ifdef RC_LOCAL_PREFIX # define RC_LOCAL_INITDIR RC_LOCAL_PREFIX "/etc/init.d" diff --git a/src/openrc-run/openrc-run.c b/src/openrc-run/openrc-run.c index 5ec2cd86..ecab9228 100644 --- a/src/openrc-run/openrc-run.c +++ b/src/openrc-run/openrc-run.c @@ -970,7 +970,7 @@ svc_stop_deps(RC_SERVICE state) continue; if (rc_runlevel_stopping()) { /* If shutting down, we should stop even - * if a dependant failed */ + * if a dependent failed */ if (runlevel && (strcmp(runlevel, RC_LEVEL_SHUTDOWN) == 0 || diff --git a/src/openrc-user/openrc-user.c b/src/openrc-user/openrc-user.c index 9b5f20e9..53f1f945 100644 --- a/src/openrc-user/openrc-user.c +++ b/src/openrc-user/openrc-user.c @@ -53,7 +53,7 @@ int main(int argc, char **argv) { setenv("EINFO_LOG", "openrc-user", true); if (argc < 2 || argc > 2) { - elog(LOG_ERR, "Invalid usaged. %s ", argv[0]); + elog(LOG_ERR, "Invalid usage. %s ", argv[0]); return -1; } diff --git a/src/shared/selinux.c b/src/shared/selinux.c index 67f84d3c..05f3c230 100644 --- a/src/shared/selinux.c +++ b/src/shared/selinux.c @@ -397,7 +397,7 @@ void selinux_setup(char **argv) /* * exec will recycle ptys so try and use open_init_pty if it exists - * which will open the pty with initrc_devpts_t, if it doesnt exist, + * which will open the pty with initrc_devpts_t, if it doesn't exist, * fall back to plain exec */ if (!access("/usr/sbin/open_init_pty", X_OK)) { diff --git a/src/start-stop-daemon/start-stop-daemon.c b/src/start-stop-daemon/start-stop-daemon.c index d9a9a0f5..409b34b2 100644 --- a/src/start-stop-daemon/start-stop-daemon.c +++ b/src/start-stop-daemon/start-stop-daemon.c @@ -2,7 +2,7 @@ start-stop-daemon * Starts, stops, tests and signals daemons * - * This is essentially a ground up re-write of Debians + * This is essentially a ground up re-write of Debian's * start-stop-daemon for cleaner code and to integrate into our RC * system so we can monitor daemons a little. */ diff --git a/support/openvpn/down.sh b/support/openvpn/down.sh index e4beee0a..abb32a55 100755 --- a/support/openvpn/down.sh +++ b/support/openvpn/down.sh @@ -16,13 +16,13 @@ if command -v resolvconf >/dev/null 2>&1; then resolvconf -d "${dev}" elif [ -e /etc/resolv.conf-"${dev}".sv ]; then - # Important that we copy instead of move incase resolv.conf is + # Important that we copy instead of move in case resolv.conf is # a symlink and not an actual file cp -p /etc/resolv.conf-"${dev}".sv /etc/resolv.conf rm -f /etc/resolv.conf-"${dev}".sv fi -# Re-enter the init script to stop any dependant services +# Re-enter the init script to stop any dependent services if [ -x "${RC_SERVICE}" ]; then if "${RC_SERVICE}" --quiet status; then IN_BACKGROUND=YES diff --git a/support/openvpn/up.sh b/support/openvpn/up.sh index 63786787..08396533 100755 --- a/support/openvpn/up.sh +++ b/support/openvpn/up.sh @@ -21,7 +21,7 @@ # We need to add a flag to resolvconf to say # "these nameservers should only be used for the listed search domains # if other global nameservers are present on other interfaces" -# This however, will break compatibility with Debians resolvconf +# This however, will break compatibility with Debian's resolvconf # A possible workaround would be to just list multiple domain lines # and try and let resolvconf handle it @@ -68,7 +68,7 @@ fi # If we have a service specific script, run this now [ -x "${RC_SVCNAME}"-up.sh ] && "${RC_SVCNAME}"-up.sh -# Re-enter the init script to start any dependant services +# Re-enter the init script to start any dependent services if [ -x "${RC_SERVICE}" ]; then if ! "${RC_SERVICE}" --quiet status; then IN_BACKGROUND=YES