[systemd-commits] 2 commits - man/crypttab.xml man/networkctl.xml man/sd_event_add_child.xml man/sd_notify.xml NEWS shell-completion/zsh src/core src/import src/machine src/resolve src/tmpfiles TODO
Zbigniew Jędrzejewski-Szmek
zbyszek at kemper.freedesktop.org
Mon Jan 26 07:40:28 PST 2015
NEWS | 8 ++++----
TODO | 2 +-
man/crypttab.xml | 2 +-
man/networkctl.xml | 2 +-
man/sd_event_add_child.xml | 2 +-
man/sd_notify.xml | 2 +-
shell-completion/zsh/_systemd-analyze | 2 +-
src/core/cgroup.c | 2 +-
src/core/load-fragment.c | 2 +-
src/import/import-dkr.c | 2 +-
src/machine/machinectl.c | 2 +-
src/resolve/resolved-manager.c | 2 +-
src/tmpfiles/tmpfiles.c | 10 +++-------
13 files changed, 18 insertions(+), 22 deletions(-)
New commits:
commit cc98b3025eeb89addb76a27390cb2baca4eab8b9
Author: Torstein Husebø <torstein at huseboe.net>
Date: Mon Jan 26 15:29:14 2015 +0100
treewide: fix multiple typos
diff --git a/NEWS b/NEWS
index d4d505d..dbfec9a 100644
--- a/NEWS
+++ b/NEWS
@@ -985,7 +985,7 @@ CHANGES WITH 214:
fact that many distributions only ship a very small number
of LSB/SysV init scripts nowadays.
- * Priviliged Xen (dom0) domains are not considered
+ * Privileged Xen (dom0) domains are not considered
virtualization anymore by the virtualization detection
logic. After all, they generally have unrestricted access to
the hardware and usually are used to manage the unprivileged
@@ -2048,8 +2048,8 @@ CHANGES WITH 208:
* The memory.use_hierarchy cgroup attribute is now enabled for
all cgroups systemd creates in the memory cgroup
hierarchy. This option is likely to be come the built-in
- default in the kernel anyway, and the non-hierarchial mode
- never made much sense in the intrinsically hierarchial
+ default in the kernel anyway, and the non-hierarchical mode
+ never made much sense in the intrinsically hierarchical
cgroup system.
* A new field _SYSTEMD_SLICE= is logged along with all journal
@@ -2309,7 +2309,7 @@ CHANGES WITH 205:
together, or apply resource limits on them.
Slice units may be used to partition system resources in an
- hierarchial fashion and then assign other units to them. By
+ hierarchical fashion and then assign other units to them. By
default there are now three slices: system.slice (for all
system services), user.slice (for all user sessions),
machine.slice (for VMs and containers).
diff --git a/TODO b/TODO
index 2406a87..1077cc1 100644
--- a/TODO
+++ b/TODO
@@ -49,7 +49,7 @@ Features:
* introduce systemd-nspawn-ephemeral at .service, and hook it into "machinectl start" with a new --ephemeral switch
-* logind,machined: add generic catch-all polkit verbs for most priviliged operations, similar to systemd itself
+* logind,machined: add generic catch-all polkit verbs for most privileged operations, similar to systemd itself
* "machinectl status" should also show internal logs of the container in question
diff --git a/man/crypttab.xml b/man/crypttab.xml
index 737b232..1a1002e 100644
--- a/man/crypttab.xml
+++ b/man/crypttab.xml
@@ -337,7 +337,7 @@
systemd should wait for a device to
show up before giving up on the
entry. The argument is a time in
- seconds or explicitly specifified
+ seconds or explicitly specified
units of <literal>s</literal>,
<literal>min</literal>,
<literal>h</literal>,
diff --git a/man/networkctl.xml b/man/networkctl.xml
index c393090..2045511 100644
--- a/man/networkctl.xml
+++ b/man/networkctl.xml
@@ -45,7 +45,7 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>.
<refnamediv>
<refname>networkctl</refname>
- <refpurpose>Query the statuc of network links</refpurpose>
+ <refpurpose>Query the status of network links</refpurpose>
</refnamediv>
<refsynopsisdiv>
diff --git a/man/sd_event_add_child.xml b/man/sd_event_add_child.xml
index ee524e1..cf8ed0a 100644
--- a/man/sd_event_add_child.xml
+++ b/man/sd_event_add_child.xml
@@ -146,7 +146,7 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>.
<term><constant>-EINVAL</constant></term>
<listitem><para>An invalid argument has been passed. This includes
- specyfing an empty mask in <parameter>options</parameter> or a mask
+ specifying an empty mask in <parameter>options</parameter> or a mask
which contains values different than a combination of
<constant>WEXITED</constant>, <constant>WSTOPPED</constant>, and
<constant>WCONTINUED</constant>.
diff --git a/man/sd_notify.xml b/man/sd_notify.xml
index 2bf3383..b7c33da 100644
--- a/man/sd_notify.xml
+++ b/man/sd_notify.xml
@@ -256,7 +256,7 @@
zero). See
<citerefentry><refentrytitle>systemd.service</refentrytitle><manvolnum>5</manvolnum></citerefentry>
for details. Multiple arrays of file
- descriptors may be sent in seperate
+ descriptors may be sent in separate
messages, in which case the arrays are
combined. Note that the service
manager removes duplicate file
diff --git a/shell-completion/zsh/_systemd-analyze b/shell-completion/zsh/_systemd-analyze
index 3edf92e..2c0e543 100644
--- a/shell-completion/zsh/_systemd-analyze
+++ b/shell-completion/zsh/_systemd-analyze
@@ -47,7 +47,7 @@ _arguments \
'--system[Operate on system systemd instance]' \
'--user[Operate on user systemd instance]' \
'--no-pager[Do not pipe output into a pager]' \
- '--man=[Do (not) check for exietnce of man pages]:boolean:(1 0)' \
+ '--man=[Do (not) check for existence of man pages]:boolean:(1 0)' \
'--order[When generating graph for dot, show only order]' \
'--require[When generating graph for dot, show only requirement]' \
'--fuzz=[When printing the tree of the critical chain, print also services, which finished TIMESPAN earlier, than the latest in the branch]:TIMESPAN' \
diff --git a/src/core/cgroup.c b/src/core/cgroup.c
index 16b8e1e..64d00b1 100644
--- a/src/core/cgroup.c
+++ b/src/core/cgroup.c
@@ -954,7 +954,7 @@ int manager_setup_cgroup(Manager *m) {
if (m->pin_cgroupfs_fd < 0)
return log_error_errno(errno, "Failed to open pin file: %m");
- /* 6. Always enable hierarchial support if it exists... */
+ /* 6. Always enable hierarchical support if it exists... */
cg_set_attribute("memory", "/", "memory.use_hierarchy", "1");
}
diff --git a/src/core/load-fragment.c b/src/core/load-fragment.c
index 516731a..98794bf 100644
--- a/src/core/load-fragment.c
+++ b/src/core/load-fragment.c
@@ -589,7 +589,7 @@ int config_parse_exec(const char *unit,
}
found:
- /* If seperate_argv0, we'll move first element to path variable */
+ /* If separate_argv0, we'll move first element to path variable */
n = new(char*, MAX(k + !separate_argv0, 1u));
if (!n)
return log_oom();
diff --git a/src/import/import-dkr.c b/src/import/import-dkr.c
index 78ea808..a4ff6f4 100644
--- a/src/import/import-dkr.c
+++ b/src/import/import-dkr.c
@@ -752,7 +752,7 @@ static void dkr_import_job_on_finished(ImportJob *j) {
r = btrfs_subvol_set_read_only(i->temp_path, true);
if (r < 0) {
- log_error_errno(r, "Failed to mark snapshort read-only: %m");
+ log_error_errno(r, "Failed to mark snapshot read-only: %m");
goto finish;
}
diff --git a/src/machine/machinectl.c b/src/machine/machinectl.c
index 728cd42..071b2b9 100644
--- a/src/machine/machinectl.c
+++ b/src/machine/machinectl.c
@@ -1785,7 +1785,7 @@ static int transfer_signal_handler(sd_event_source *s, const struct signalfd_sig
assert(si);
if (!arg_quiet)
- log_info("Continuing download in the background. Use \"machinectl cancel-transfer %" PRIu32 "\" to arbort transfer.", PTR_TO_UINT32(userdata));
+ log_info("Continuing download in the background. Use \"machinectl cancel-transfer %" PRIu32 "\" to abort transfer.", PTR_TO_UINT32(userdata));
sd_event_exit(sd_event_source_get_event(s), EINTR);
return 0;
diff --git a/src/resolve/resolved-manager.c b/src/resolve/resolved-manager.c
index 2edfb9f..890cc04 100644
--- a/src/resolve/resolved-manager.c
+++ b/src/resolve/resolved-manager.c
@@ -196,7 +196,7 @@ static int manager_rtnl_listen(Manager *m) {
assert(m);
- /* First, subscibe to interfaces coming and going */
+ /* First, subscribe to interfaces coming and going */
r = sd_rtnl_open(&m->rtnl, 3, RTNLGRP_LINK, RTNLGRP_IPV4_IFADDR, RTNLGRP_IPV6_IFADDR);
if (r < 0)
return r;
commit ebf31a1f58d0b10ca63c928ff31b7745fc724003
Author: Zbigniew Jędrzejewski-Szmek <zbyszek at in.waw.pl>
Date: Mon Jan 26 10:39:03 2015 -0500
tmpfiles: use casts instead of warning suppression
This warning got its own name only in gcc5, so the suppression does
not work in gcc4, and generates a warning of its own. Use a cast,
which is ugly too, but less so.
diff --git a/src/tmpfiles/tmpfiles.c b/src/tmpfiles/tmpfiles.c
index d70dbc4..d60d5ba 100644
--- a/src/tmpfiles/tmpfiles.c
+++ b/src/tmpfiles/tmpfiles.c
@@ -879,17 +879,13 @@ static int item_do_children(Item *i, const char *path, action_t action) {
}
static int glob_item(Item *i, action_t action, bool recursive) {
-DISABLE_WARNING_INCOMPATIBLE_POINTER_TYPES
-DISABLE_WARNING_DECLARATION_AFTER_STATEMENT
_cleanup_globfree_ glob_t g = {
- .gl_closedir = closedir,
- .gl_readdir = readdir,
- .gl_opendir = opendir_nomod,
+ .gl_closedir = (void (*)(void *)) closedir,
+ .gl_readdir = (struct dirent *(*)(void *)) readdir,
+ .gl_opendir = (void *(*)(const char *)) opendir_nomod,
.gl_lstat = lstat,
.gl_stat = stat,
};
-REENABLE_WARNING
-REENABLE_WARNING
int r = 0, k;
char **fn;
More information about the systemd-commits
mailing list