Commit 35b8ca3a authored by Harald Hoyer's avatar Harald Hoyer Committed by Lennart Poettering
Browse files

Spelling Corrections

Just some lame spelling corrections with no functionality.
parent a9bd141b
......@@ -20,7 +20,7 @@
we those lookups involve synchronously talking to services that we
would need to start up.
- Do not acccess any directories outside of /etc/, /dev, /lib from the
- Do not access any directories outside of /etc/, /dev, /lib from the
init daemon to avoid deadlocks with the automounter.
- Don't synchronously talk to any other service, due to risk of
......
......@@ -583,7 +583,7 @@ static void automount_enter_runnning(Automount *a) {
/* Before we do anything, let's see if somebody is playing games with us? */
if (lstat(a->where, &st) < 0) {
log_warning("%s failed stat automount point: %m", a->meta.id);
log_warning("%s failed to stat automount point: %m", a->meta.id);
goto fail;
}
......
......@@ -46,7 +46,7 @@ int main(int argc, char *argv[]) {
/* We send this event to the private D-Bus socket and then the
* system instance will forward this to the system bus. We do
* this to avoid an actviation loop when we start dbus when we
* this to avoid an activation loop when we start dbus when we
* are called when the dbus service is shut down. */
if (!(bus = dbus_connection_open_private("unix:abstract=/org/freedesktop/systemd1/private", &error))) {
......
......@@ -418,7 +418,7 @@ static DBusHandlerResult api_bus_message_filter(DBusConnection *connection, DBus
goto oom;
}
/* On success we don't do anything, the service will be spwaned now */
/* On success we don't do anything, the service will be spawned now */
}
}
......
......@@ -65,7 +65,7 @@ static void device_init(Unit *u) {
/* In contrast to all other unit types we timeout jobs waiting
* for devices by default. This is because they otherwise wait
* indefinetely for plugged in devices, something which cannot
* indefinitely for plugged in devices, something which cannot
* happen for the other units since their operations time out
* anyway. */
d->meta.job_timeout = DEFAULT_TIMEOUT_USEC;
......@@ -542,7 +542,7 @@ void device_fd_event(Manager *m, int events) {
if (!(dev = udev_monitor_receive_device(m->udev_monitor))) {
/*
* libudev might filter-out devices which pass the bloom filter,
* so getting NULL here is not neccessarily an error
* so getting NULL here is not necessarily an error
*/
return;
}
......
......@@ -40,7 +40,7 @@ struct Device {
char *sysfs;
/* In order to be able to distuingish dependencies on
/* In order to be able to distinguish dependencies on
different device nodes we might end up creating multiple
devices for the same sysfs path. We chain them up here. */
......
......@@ -592,7 +592,7 @@ static int get_user_creds(const char **username, uid_t *uid, gid_t *gid, const c
/* If there are multiple users with the same id, make
* sure to leave $USER to the configured value instead
* of the first occurence in the database. However if
* of the first occurrence in the database. However if
* the uid was configured by a numeric uid, then let's
* pick the real username from /etc/passwd. */
if (*username && p)
......@@ -617,7 +617,7 @@ static int enforce_groups(const ExecContext *context, const char *username, gid_
assert(context);
/* Lookup and ser GID and supplementary group list. Here too
/* Lookup and set GID and supplementary group list. Here too
* we avoid NSS lookups for gid=0. */
if (context->group || username) {
......@@ -700,7 +700,7 @@ static int enforce_user(const ExecContext *context, uid_t uid) {
/* First step: If we need to keep capabilities but
* drop privileges we need to make sure we keep our
* caps, whiel we drop priviliges. */
* caps, whiel we drop privileges. */
if (uid != 0) {
int sb = context->secure_bits|SECURE_KEEP_CAPS;
......@@ -709,7 +709,7 @@ static int enforce_user(const ExecContext *context, uid_t uid) {
return -errno;
}
/* Second step: set the capabilites. This will reduce
/* Second step: set the capabilities. This will reduce
* the capabilities to the minimum we need. */
if (!(d = cap_dup(context->capabilities)))
......@@ -780,7 +780,7 @@ static int setup_pam(
assert(pam_env);
/* We set up PAM in the parent process, then fork. The child
* will then stay around untill killed via PR_GET_PDEATHSIG or
* will then stay around until killed via PR_GET_PDEATHSIG or
* systemd via the cgroup logic. It will then remove the PAM
* session again. The parent process will exec() the actual
* daemon. We do things this way to ensure that the main PID
......@@ -841,7 +841,7 @@ static int setup_pam(
/* Wait until our parent died. This will most likely
* not work since the kernel does not allow
* unpriviliged paretns kill their priviliged children
* unprivileged parents kill their privileged children
* this way. We rely on the control groups kill logic
* to do the rest for us. */
if (prctl(PR_SET_PDEATHSIG, SIGTERM) < 0)
......@@ -1242,7 +1242,7 @@ int exec_spawn(ExecCommand *command,
goto fail;
}
/* PR_GET_SECUREBITS is not priviliged, while
/* PR_GET_SECUREBITS is not privileged, while
* PR_SET_SECUREBITS is. So to suppress
* potential EPERMs we'll try not to call
* PR_SET_SECUREBITS unless necessary. */
......@@ -1779,7 +1779,7 @@ void exec_command_append_list(ExecCommand **l, ExecCommand *e) {
assert(e);
if (*l) {
/* It's kinda important that we keep the order here */
/* It's kind of important, that we keep the order here */
LIST_FIND_TAIL(ExecCommand, command, *l, end);
LIST_INSERT_AFTER(ExecCommand, command, *l, end, e);
} else
......
......@@ -101,7 +101,7 @@ JobDependency* job_dependency_new(Job *subject, Job *object, bool matters, bool
/* Adds a new job link, which encodes that the 'subject' job
* needs the 'object' job in some way. If 'subject' is NULL
* this means the 'anchor' job (i.e. the one the user
* explcitily asked for) is the requester. */
* explicitly asked for) is the requester. */
if (!(l = new0(JobDependency, 1)))
return NULL;
......
......@@ -45,7 +45,7 @@ static bool syslog_is_stream = false;
static bool show_color = false;
static bool show_location = false;
/* Akin to glibc's __abort_msg; which is private and we hance cannot
/* Akin to glibc's __abort_msg; which is private and we hence cannot
* use here. */
static char *log_abort_msg = NULL;
......@@ -74,7 +74,7 @@ static int log_open_console(void) {
return console_fd;
}
log_debug("Succesfully opened /dev/console for logging.");
log_debug("Successfully opened /dev/console for logging.");
} else
console_fd = STDERR_FILENO;
......@@ -100,7 +100,7 @@ static int log_open_kmsg(void) {
return -errno;
}
log_debug("Succesfully opened /dev/kmsg for logging.");
log_debug("Successfully opened /dev/kmsg for logging.");
return 0;
}
......@@ -171,7 +171,7 @@ static int log_open_syslog(void) {
} else
syslog_is_stream = false;
log_debug("Succesfully opened syslog for logging.");
log_debug("Successfully opened syslog for logging.");
return 0;
......
......@@ -520,7 +520,7 @@ static int server_init(Server *s, unsigned n_sockets) {
/* We use ev.data.ptr instead of ev.data.fd here,
* since on 64bit archs fd is 32bit while a pointer is
* 64bit. To make sure we can easily distuingish fd
* 64bit. To make sure we can easily distinguish fd
* values and pointer values we want to make sure to
* write the full field unconditionally. */
......
......@@ -858,7 +858,7 @@ static int prepare_reexecute(Manager *m, FILE **_f, FDSet **_fds) {
assert(_fds);
if ((r = manager_open_serialization(m, &f)) < 0) {
log_error("Failed to create serialization faile: %s", strerror(-r));
log_error("Failed to create serialization file: %s", strerror(-r));
goto fail;
}
......@@ -974,7 +974,7 @@ int main(int argc, char *argv[]) {
char systemd[] = "systemd";
if (getpid() != 1 && strstr(program_invocation_short_name, "init")) {
/* This is compatbility support for SysV, where
/* This is compatibility support for SysV, where
* calling init as a user is identical to telinit. */
errno = -ENOENT;
......
......@@ -294,7 +294,7 @@ static unsigned manager_dispatch_cleanup_queue(Manager *m) {
}
enum {
GC_OFFSET_IN_PATH, /* This one is on the path we were travelling */
GC_OFFSET_IN_PATH, /* This one is on the path we were traveling */
GC_OFFSET_UNSURE, /* No clue */
GC_OFFSET_GOOD, /* We still need this unit */
GC_OFFSET_BAD, /* We don't need this unit anymore */
......@@ -768,7 +768,7 @@ static int delete_one_unmergeable_job(Manager *m, Job *j) {
/* Tries to delete one item in the linked list
* j->transaction_next->transaction_next->... that conflicts
* whith another one, in an attempt to make an inconsistent
* with another one, in an attempt to make an inconsistent
* transaction work. */
/* We rely here on the fact that if a merged with b does not
......@@ -1286,7 +1286,7 @@ static int transaction_activate(Manager *m, JobMode mode, DBusError *e) {
break;
if (r != -EAGAIN) {
log_warning("Requested transaction contains unmergable jobs: %s", bus_error(e, r));
log_warning("Requested transaction contains unmergeable jobs: %s", bus_error(e, r));
goto rollback;
}
......@@ -1330,7 +1330,7 @@ static Job* transaction_add_one_job(Manager *m, JobType type, Unit *unit, bool o
assert(m);
assert(unit);
/* Looks for an axisting prospective job and returns that. If
/* Looks for an existing prospective job and returns that. If
* it doesn't exist it is created and added to the prospective
* jobs list. */
......
......@@ -93,7 +93,7 @@ struct Watch {
struct Manager {
/* Note that the set of units we know of is allowed to be
* incosistent. However the subset of it that is loaded may
* inconsistent. However the subset of it that is loaded may
* not, and the list of jobs may neither. */
/* Active jobs and units */
......@@ -194,7 +194,7 @@ struct Manager {
int gc_marker;
unsigned n_in_gc_queue;
/* Make sure the user cannot accidentaly unmount our cgroup
/* Make sure the user cannot accidentally unmount our cgroup
* file system */
int pin_cgroupfs_fd;
......
......@@ -161,11 +161,11 @@ static int apply_mount(Path *p, const char *root_dir, const char *inaccessible_d
/* The bind mount will always inherit the original
* flags. If we want to set any flag we need
* to do so in a second indepdant step. */
* to do so in a second independent step. */
if (flags)
r = mount(NULL, where, NULL, MS_REMOUNT|MS_BIND|MS_REC|flags, NULL);
/* Avoid expontial growth of trees */
/* Avoid exponential growth of trees */
if (r >= 0 && path_equal(p->path, "/"))
r = mount(NULL, where, NULL, MS_REMOUNT|MS_BIND|MS_UNBINDABLE|flags, NULL);
......
......@@ -185,7 +185,7 @@ int sd_is_socket_unix(int fd, int type, int listening, const char *path, size_t
READY=1 Tells systemd that daemon startup is finished (only
relevant for services of Type=notify). The passed
argument is a boolean "1" or "0". Since there is
little value in signalling non-readiness the only
little value in signaling non-readiness the only
value daemons should send is "READY=1".
STATUS=... Passes a single-line status string back to systemd
......@@ -206,7 +206,7 @@ int sd_is_socket_unix(int fd, int type, int listening, const char *path, size_t
fork off the process itself. Example: "MAINPID=4711"
Daemons can choose to send additional variables. However, it is
recommened to prefix variable names not listed above with X_.
recommended to prefix variable names not listed above with X_.
Returns a negative errno-style error code on failure. Returns > 0
if systemd could be notified, 0 if it couldn't possibly because
......
......@@ -16,7 +16,7 @@
#define SECURE_NOROOT_LOCKED 1 /* make bit-0 immutable */
/* When set, setuid to/from uid 0 does not trigger capability-"fixup".
When unset, to provide compatiblility with old programs relying on
When unset, to provide compatibility with old programs relying on
set*uid to gain/lose privilege, transitions to/from uid 0 cause
capabilities to be gained/lost. */
#define SECURE_NO_SETUID_FIXUP 2
......
......@@ -335,7 +335,7 @@ static int sysv_translate_facility(const char *name, const char *filename, char
/* Facilities starting with $ are most likely targets */
r = unit_name_build(n, NULL, ".target");
} else if (filename && streq(name, filename))
/* Names equalling the file name of the services are redundant */
/* Names equaling the file name of the services are redundant */
return 0;
else
/* Everything else we assume to be normal service names */
......@@ -2777,7 +2777,7 @@ static void service_timer_event(Unit *u, uint64_t elapsed, Watch* w) {
break;
case SERVICE_STOP_SIGKILL:
/* Uh, wie sent a SIGKILL and it is still not gone?
/* Uh, we sent a SIGKILL and it is still not gone?
* Must be something we cannot kill, so let's just be
* weirded out and continue */
......@@ -3052,7 +3052,7 @@ static int service_enumerate(Manager *m) {
/* We honour K links only for halt/reboot. For the normal
* runlevels we assume the stop jobs will be implicitly added
* by the core logic. Also, we don't really distuingish here
* by the core logic. Also, we don't really distinguish here
* between the runlevels 0 and 6 and just add them to the
* special shutdown target. On SUSE the boot.d/ runlevel is
* also used for shutdown, so we add links for that too to the
......
......@@ -334,7 +334,7 @@ int main(int argc, char *argv[]) {
}
if (retries >= FINALIZE_ATTEMPTS)
log_error("Too many interations, giving up.");
log_error("Too many iterations, giving up.");
execute_directory(SYSTEM_SHUTDOWN_PATH, NULL, NULL);
......
......@@ -1363,7 +1363,7 @@ static int socket_start(Unit *u) {
if (s->service->meta.load_state != UNIT_LOADED)
return -ENOENT;
/* If the service is alredy active we cannot start the
/* If the service is already active we cannot start the
* socket */
if (s->service->state != SERVICE_DEAD &&
s->service->state != SERVICE_FAILED &&
......@@ -1798,7 +1798,7 @@ void socket_connection_unref(Socket *s) {
/* The service is dead. Yay!
*
* This is strictly for one-onstance-per-connection
* This is strictly for one-instance-per-connection
* services. */
assert(s->n_connections > 0);
......
......@@ -355,7 +355,7 @@ char **strv_remove(char **l, const char *s) {
if (!l)
return NULL;
/* Drops every occurence of s in the string list */
/* Drops every occurrence of s in the string list */
for (f = t = l; *f; f++) {
......@@ -379,7 +379,7 @@ static int env_append(char **r, char ***k, char **a) {
return 0;
/* Add the entries of a to *k unless they already exist in *r
* in which case they are overriden instead. This assumes
* in which case they are overridden instead. This assumes
* there is enough space in the r array. */
for (; *a; a++) {
......@@ -474,7 +474,7 @@ char **strv_env_delete(char **x, unsigned n_lists, ...) {
char **l, **k, **r, **j;
va_list ap;
/* Deletes every entry fromx that is mentioned in the other
/* Deletes every entry from x that is mentioned in the other
* string lists */
n = strv_length(x);
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment