From 013d8a39a6178179080bcfee9122b29cf9d29259 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Fri, 22 Jun 2012 23:14:19 +0200 Subject: man: introduce bootup(7) --- man/bootup.xml | 226 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 226 insertions(+) create mode 100644 man/bootup.xml (limited to 'man/bootup.xml') diff --git a/man/bootup.xml b/man/bootup.xml new file mode 100644 index 0000000000..ae84cff0b7 --- /dev/null +++ b/man/bootup.xml @@ -0,0 +1,226 @@ + + + + + + + + + bootup + systemd + + + + Developer + Lennart + Poettering + lennart@poettering.net + + + + + + bootup + 7 + + + + bootup + The System Bootup Process + + + + Description + + A number of different components are involved in the + system boot. Immediately after power-up, the system + BIOS will do minimal hardware initialization, and hand + control over to a boot loader stored on a persistant + storage device. This boot loader will then invoke an + OS kernel from disk (or the network). In the Linux + case this kernel now (optionally) extracts and + executes an initial RAM disk image (initrd) such as + dracut8 + which looks for the root file system. After the root + file system is found and mounted the initrd hands over + control to the system manager (such as + systemd1) + stored on the OS image which is then responsible for + probing all remaining hardware, mounting all necessary + file systems and spawning all configured + services. + + On shutdown the system manager stops all + services, unmounts all file systems (detaching the + storage technologies backing them), and then + (optionally) jumps back into the initrd code which + unmounts/detaches the root file system and the storage + it resides on. As last step the system powered down. + + Additional information about the system boot + process may be found in + boot7. + + + + System Manager Bootup + + At boot, the system manager on the OS image is + responsible for initializing the required file + systems, services and drivers that are necessary for + operation of the system. On + systemd1 + systems this process is split up in various discrete + steps which are exposed as target units. (See + systemd.target5 + for detailed information about target units.) The + boot-up process is highly parallelized so that the + order in which specific target units are reached is not + deterministic, but still adheres to a limited amount + of ordering structure. + + When systemd starts up the system it will + activate all units that are dependencies of + default.target (as well as + recursively all dependencies of these + dependencies). Usually + default.target is simply an alias + of graphical.target or + multi-user.target depending on + whether the system is configured for a graphical UI or + only for a text console. To enforce minimal ordering + between the units pulled in a number of well-known + target units are available, as listed on + systemd.special7. + + The follow chart is a structural overview of + these well-known units and their position in the + boot-up logic. The arrows describe which units are + pulled in and ordered before which other units. Units + near the top are started before units nearer to the + bottom of the chart. + +local-fs-pre.target + | + v +(various mounts and (various swap (various cryptsetup + fsck services...) devices...) devices...) (various low-level (various low-level + | | | services: udevd, API VFS mounts: + v v v tmpfiles, random mqueue, configfs, + local-fs.target swap.target cryptsetup.target seed, sysctl, ...) debugfs, ...) + | | | | | + \__________________|_________________ | ___________________|____________________/ + \|/ + v + sysinit.target + | + _________________/|\___________________ + / | \ + | | | + v | v + (various | rescue.service + sockets...) | | + | | v + v | rescue.target + sockets.target | + | | + \_________________ | + \| + v + basic.target + | + _________________/| emergency.service + / | | + | | v + v v emergency.target + (various system (various system + services services) + required for | + graphical UIs) v + | multi-user.target + | | + | _________________/ + |/ + v + graphical.target + + Target units that are commonly used as boot + targets are emphasized. These + units are good choices as goal targets, for + example by passing them to the + systemd.unit= kernel command line + option (see + systemd1) + or by symlinking default.target + to them. + + + + System Manager Shutdown + + System shutdown also consists of various target + units with some minimal ordering structure + applied: + + + + + (conflicts with (conflicts with + all system all file system + services) mounts, swaps, + | cryptsetup + | devices, ...) + | | + v v + shutdown.target umount.target + | | + \_______ ______/ + \ / + v + (various low-level + services) + | + v + final.target + | + __________________________/ \_____________________ + / | | \ + | | | | + v v v v +reboot.service poweroff.service halt.service kexec.service + | | | | + v v v v +reboot.target poweroff.target halt.target kexec.target + + Commonly used system shutdown targets are emphasized. + + + + See Also + + systemd1, + boot7, + systemd.special7, + systemd.target5 + + + + -- cgit v1.2.3-54-g00ecf From 0e0320e04500d1e68630b3973714f14cfb7b3450 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Mon, 25 Jun 2012 14:24:56 +0200 Subject: units: rename halt/hibernate/kexec/poweroff/reboot/suspend to systed-xxx These service units also execute our own code, hence rename the accordingly and prefix them with systemd- --- Makefile.am | 32 ++++++------ man/bootup.xml | 52 +++++++++---------- man/systemd.special.xml | 6 +-- units/.gitignore | 74 +++++++++++++-------------- units/halt.service.in | 16 ------ units/halt.target | 4 +- units/hibernate.service.in | 16 ------ units/hibernate.target | 5 +- units/kexec.service.in | 16 ------ units/kexec.target | 4 +- units/poweroff.service.in | 16 ------ units/poweroff.target | 4 +- units/reboot.service.in | 16 ------ units/reboot.target | 4 +- units/suspend.service.in | 16 ------ units/suspend.target | 4 +- units/systemd-halt.service.in | 16 ++++++ units/systemd-hibernate.service.in | 16 ++++++ units/systemd-kexec.service.in | 16 ++++++ units/systemd-poweroff.service.in | 16 ++++++ units/systemd-random-seed-load.service.in | 5 +- units/systemd-random-seed-save.service.in | 5 +- units/systemd-reboot.service.in | 16 ++++++ units/systemd-suspend.service.in | 16 ++++++ units/systemd-update-utmp-runlevel.service.in | 6 ++- units/systemd-update-utmp-shutdown.service.in | 6 ++- units/user/.gitignore | 2 +- units/user/exit.service.in | 17 ------ units/user/exit.target | 4 +- units/user/systemd-exit.service.in | 17 ++++++ 30 files changed, 220 insertions(+), 223 deletions(-) delete mode 100644 units/halt.service.in delete mode 100644 units/hibernate.service.in delete mode 100644 units/kexec.service.in delete mode 100644 units/poweroff.service.in delete mode 100644 units/reboot.service.in delete mode 100644 units/suspend.service.in create mode 100644 units/systemd-halt.service.in create mode 100644 units/systemd-hibernate.service.in create mode 100644 units/systemd-kexec.service.in create mode 100644 units/systemd-poweroff.service.in create mode 100644 units/systemd-reboot.service.in create mode 100644 units/systemd-suspend.service.in delete mode 100644 units/user/exit.service.in create mode 100644 units/user/systemd-exit.service.in (limited to 'man/bootup.xml') diff --git a/Makefile.am b/Makefile.am index c3e3ad280e..7193c86f49 100644 --- a/Makefile.am +++ b/Makefile.am @@ -328,17 +328,17 @@ nodist_systemunit_DATA = \ units/systemd-ask-password-wall.service \ units/systemd-ask-password-console.service \ units/systemd-sysctl.service \ - units/halt.service \ units/emergency.service \ - units/hibernate.service \ - units/poweroff.service \ - units/reboot.service \ - units/kexec.service \ - units/systemd-fsck@.service \ - units/systemd-fsck-root.service \ units/rescue.service \ - units/suspend.service \ units/user@.service \ + units/systemd-hibernate.service \ + units/systemd-suspend.service \ + units/systemd-halt.service \ + units/systemd-poweroff.service \ + units/systemd-reboot.service \ + units/systemd-kexec.service \ + units/systemd-fsck@.service \ + units/systemd-fsck-root.service \ units/systemd-udev.service \ units/systemd-udev-trigger.service \ units/systemd-udev-settle.service \ @@ -349,7 +349,7 @@ dist_userunit_DATA = \ units/user/exit.target nodist_userunit_DATA = \ - units/user/exit.service + units/user/systemd-exit.service EXTRA_DIST += \ units/getty@.service.m4 \ @@ -369,11 +369,11 @@ EXTRA_DIST += \ units/systemd-ask-password-console.service.in \ units/systemd-sysctl.service.in \ units/emergency.service.in \ - units/halt.service.in \ - units/poweroff.service.in \ - units/reboot.service.in \ - units/kexec.service.in \ - units/user/exit.service.in \ + units/systemd-halt.service.in \ + units/systemd-poweroff.service.in \ + units/systemd-reboot.service.in \ + units/systemd-kexec.service.in \ + units/user/systemd-exit.service.in \ units/systemd-fsck@.service.in \ units/systemd-fsck-root.service.in \ units/user@.service.in \ @@ -381,8 +381,8 @@ EXTRA_DIST += \ units/systemd-udev-trigger.service \ units/systemd-udev-settle.service \ units/systemd-debug-shell.service.in \ - units/hibernate.service.in \ - units/suspend.service.in \ + units/systemd-hibernate.service.in \ + units/systemd-suspend.service.in \ introspect.awk \ man/custom-html.xsl diff --git a/man/bootup.xml b/man/bootup.xml index ae84cff0b7..69f9a273b9 100644 --- a/man/bootup.xml +++ b/man/bootup.xml @@ -183,32 +183,32 @@ - (conflicts with (conflicts with - all system all file system - services) mounts, swaps, - | cryptsetup - | devices, ...) - | | - v v - shutdown.target umount.target - | | - \_______ ______/ - \ / - v - (various low-level - services) - | - v - final.target - | - __________________________/ \_____________________ - / | | \ - | | | | - v v v v -reboot.service poweroff.service halt.service kexec.service - | | | | - v v v v -reboot.target poweroff.target halt.target kexec.target + (conflicts with (conflicts with + all system all file system + services) mounts, swaps, + | cryptsetup + | devices, ...) + | | + v v + shutdown.target umount.target + | | + \_______ ______/ + \ / + v + (various low-level + services) + | + v + final.target + | + _____________________________________/ \_________________________________ + / | | \ + | | | | + v v v v +systemd-reboot.service systemd-poweroff.service systemd-halt.service systemd-kexec.service + | | | | + v v v v + reboot.target poweroff.target halt.target kexec.target Commonly used system shutdown targets are emphasized. diff --git a/man/systemd.special.xml b/man/systemd.special.xml index 4321f54698..fdb2020376 100644 --- a/man/systemd.special.xml +++ b/man/systemd.special.xml @@ -57,8 +57,8 @@ default.target, display-manager.service, emergency.target, - exit.service, - final.service, + exit.target, + final.target, getty.target, graphical.target, hibernate.target, @@ -813,7 +813,7 @@ - exit.service + exit.target A special service unit for shutting down the diff --git a/units/.gitignore b/units/.gitignore index 6808d1c82e..2193bedf61 100644 --- a/units/.gitignore +++ b/units/.gitignore @@ -1,48 +1,44 @@ -/hibernate.service -/suspend.service +/systemd-hibernate.service +/systemd-suspend.service /console-getty.service /systemd-journald.service -user@.service -systemd-logind.service -systemd-localed.service -systemd-timedated.service -systemd-hostnamed.service -console-shell.service -systemd-sysctl.service -systemd-ask-password-console.service -rescue.service -systemd-ask-password-wall.service +/user@.service +/systemd-logind.service +/systemd-localed.service +/systemd-timedated.service +/systemd-hostnamed.service +/console-shell.service +/systemd-sysctl.service +/systemd-ask-password-console.service +/rescue.service +/systemd-ask-password-wall.service /systemd-quotacheck.service /systemd-fsck@.service /systemd-fsck-root.service -systemd-tmpfiles-clean.service -systemd-tmpfiles-setup.service -halt.service -poweroff.service -reboot.service -kexec.service -systemd-user-sessions.service -systemd-readahead-done.service -systemd-tmpfiles.service -systemd-readahead-collect.service -systemd-readahead-replay.service -serial-getty@.service -systemd-kmsg-syslogd.service -systemd-modules-load.service +/systemd-tmpfiles-clean.service +/systemd-tmpfiles-setup.service +/systemd-halt.service +/systemd-poweroff.service +/systemd-reboot.service +/systemd-kexec.service +/systemd-user-sessions.service +/systemd-readahead-done.service +/systemd-tmpfiles.service +/systemd-readahead-collect.service +/systemd-readahead-replay.service +/serial-getty@.service +/systemd-modules-load.service /systemd-remount-fs.service -systemd-vconsole-setup.service -systemd-auto-serial-getty.service -systemd-shutdownd.service -systemd-random-seed-load.service -systemd-random-seed-save.service -systemd-initctl.service -systemd-stdout-syslog-bridge.service -getty@.service -systemd-update-utmp-runlevel.service -systemd-update-utmp-shutdown.service -test-env-replace -systemd-binfmt.service -emergency.service +/systemd-vconsole-setup.service +/systemd-shutdownd.service +/systemd-random-seed-load.service +/systemd-random-seed-save.service +/systemd-initctl.service +/getty@.service +/systemd-update-utmp-runlevel.service +/systemd-update-utmp-shutdown.service +/systemd-binfmt.service +/emergency.service /systemd-udev-settle.service /systemd-udev-trigger.service /systemd-udev.service diff --git a/units/halt.service.in b/units/halt.service.in deleted file mode 100644 index b746d1ea35..0000000000 --- a/units/halt.service.in +++ /dev/null @@ -1,16 +0,0 @@ -# This file is part of systemd. -# -# systemd is free software; you can redistribute it and/or modify it -# under the terms of the GNU Lesser General Public License as published by -# the Free Software Foundation; either version 2.1 of the License, or -# (at your option) any later version. - -[Unit] -Description=Halt -DefaultDependencies=no -Requires=shutdown.target umount.target final.target -After=shutdown.target umount.target final.target - -[Service] -Type=oneshot -ExecStart=@SYSTEMCTL@ --force halt diff --git a/units/halt.target b/units/halt.target index 41266b96f0..a21d984b26 100644 --- a/units/halt.target +++ b/units/halt.target @@ -9,8 +9,8 @@ Description=Halt Documentation=man:systemd.special(7) DefaultDependencies=no -Requires=halt.service -After=halt.service +Requires=systemd-halt.service +After=systemd-halt.service AllowIsolate=yes [Install] diff --git a/units/hibernate.service.in b/units/hibernate.service.in deleted file mode 100644 index 6dba653d37..0000000000 --- a/units/hibernate.service.in +++ /dev/null @@ -1,16 +0,0 @@ -# This file is part of systemd. -# -# systemd is free software; you can redistribute it and/or modify it -# under the terms of the GNU Lesser General Public License as published by -# the Free Software Foundation; either version 2.1 of the License, or -# (at your option) any later version. - -[Unit] -Description=Hibernate -DefaultDependencies=no -Requires=sleep.target -After=sleep.target - -[Service] -Type=oneshot -ExecStart=@rootlibexecdir@/systemd-sleep hibernate diff --git a/units/hibernate.target b/units/hibernate.target index fc8493c208..c56460237d 100644 --- a/units/hibernate.target +++ b/units/hibernate.target @@ -9,6 +9,5 @@ Description=Hibernate Documentation=man:systemd.special(7) DefaultDependencies=no -BindTo=hibernate.service -After=hibernate.service -StopWhenUnneeded=yes +BindTo=systemd-hibernate.service +After=systemd-hibernate.service diff --git a/units/kexec.service.in b/units/kexec.service.in deleted file mode 100644 index 17d0344972..0000000000 --- a/units/kexec.service.in +++ /dev/null @@ -1,16 +0,0 @@ -# This file is part of systemd. -# -# systemd is free software; you can redistribute it and/or modify it -# under the terms of the GNU Lesser General Public License as published by -# the Free Software Foundation; either version 2.1 of the License, or -# (at your option) any later version. - -[Unit] -Description=Reboot via kexec -DefaultDependencies=no -Requires=shutdown.target umount.target final.target -After=shutdown.target umount.target final.target - -[Service] -Type=oneshot -ExecStart=@SYSTEMCTL@ --force kexec diff --git a/units/kexec.target b/units/kexec.target index be8eafcf1f..90795d0c5a 100644 --- a/units/kexec.target +++ b/units/kexec.target @@ -9,8 +9,8 @@ Description=Reboot via kexec Documentation=man:systemd.special(7) DefaultDependencies=no -Requires=kexec.service -After=kexec.service +Requires=systemd-kexec.service +After=systemd-kexec.service AllowIsolate=yes [Install] diff --git a/units/poweroff.service.in b/units/poweroff.service.in deleted file mode 100644 index 851a0f9451..0000000000 --- a/units/poweroff.service.in +++ /dev/null @@ -1,16 +0,0 @@ -# This file is part of systemd. -# -# systemd is free software; you can redistribute it and/or modify it -# under the terms of the GNU Lesser General Public License as published by -# the Free Software Foundation; either version 2.1 of the License, or -# (at your option) any later version. - -[Unit] -Description=Power-Off -DefaultDependencies=no -Requires=shutdown.target umount.target final.target -After=shutdown.target umount.target final.target - -[Service] -Type=oneshot -ExecStart=@SYSTEMCTL@ --force poweroff diff --git a/units/poweroff.target b/units/poweroff.target index bb60c33dd9..71871033a5 100644 --- a/units/poweroff.target +++ b/units/poweroff.target @@ -9,8 +9,8 @@ Description=Power-Off Documentation=man:systemd.special(7) DefaultDependencies=no -Requires=poweroff.service -After=poweroff.service +Requires=systemd-poweroff.service +After=systemd-poweroff.service AllowIsolate=yes [Install] diff --git a/units/reboot.service.in b/units/reboot.service.in deleted file mode 100644 index e6a8aabd9d..0000000000 --- a/units/reboot.service.in +++ /dev/null @@ -1,16 +0,0 @@ -# This file is part of systemd. -# -# systemd is free software; you can redistribute it and/or modify it -# under the terms of the GNU Lesser General Public License as published by -# the Free Software Foundation; either version 2.1 of the License, or -# (at your option) any later version. - -[Unit] -Description=Reboot -DefaultDependencies=no -Requires=shutdown.target umount.target final.target -After=shutdown.target umount.target final.target - -[Service] -Type=oneshot -ExecStart=@SYSTEMCTL@ --force reboot diff --git a/units/reboot.target b/units/reboot.target index 9faeb1800f..dec8f56796 100644 --- a/units/reboot.target +++ b/units/reboot.target @@ -9,8 +9,8 @@ Description=Reboot Documentation=man:systemd.special(7) DefaultDependencies=no -Requires=reboot.service -After=reboot.service +Requires=systemd-reboot.service +After=systemd-reboot.service AllowIsolate=yes [Install] diff --git a/units/suspend.service.in b/units/suspend.service.in deleted file mode 100644 index 3cf819e476..0000000000 --- a/units/suspend.service.in +++ /dev/null @@ -1,16 +0,0 @@ -# This file is part of systemd. -# -# systemd is free software; you can redistribute it and/or modify it -# under the terms of the GNU Lesser General Public License as published by -# the Free Software Foundation; either version 2.1 of the License, or -# (at your option) any later version. - -[Unit] -Description=Suspend -DefaultDependencies=no -Requires=sleep.target -After=sleep.target - -[Service] -Type=oneshot -ExecStart=@rootlibexecdir@/systemd-sleep suspend diff --git a/units/suspend.target b/units/suspend.target index eaf79bed11..83f69f1b54 100644 --- a/units/suspend.target +++ b/units/suspend.target @@ -9,5 +9,5 @@ Description=Suspend Documentation=man:systemd.special(7) DefaultDependencies=no -BindTo=suspend.service -After=suspend.service +BindTo=systemd-suspend.service +After=systemd-suspend.service diff --git a/units/systemd-halt.service.in b/units/systemd-halt.service.in new file mode 100644 index 0000000000..b746d1ea35 --- /dev/null +++ b/units/systemd-halt.service.in @@ -0,0 +1,16 @@ +# This file is part of systemd. +# +# systemd is free software; you can redistribute it and/or modify it +# under the terms of the GNU Lesser General Public License as published by +# the Free Software Foundation; either version 2.1 of the License, or +# (at your option) any later version. + +[Unit] +Description=Halt +DefaultDependencies=no +Requires=shutdown.target umount.target final.target +After=shutdown.target umount.target final.target + +[Service] +Type=oneshot +ExecStart=@SYSTEMCTL@ --force halt diff --git a/units/systemd-hibernate.service.in b/units/systemd-hibernate.service.in new file mode 100644 index 0000000000..6dba653d37 --- /dev/null +++ b/units/systemd-hibernate.service.in @@ -0,0 +1,16 @@ +# This file is part of systemd. +# +# systemd is free software; you can redistribute it and/or modify it +# under the terms of the GNU Lesser General Public License as published by +# the Free Software Foundation; either version 2.1 of the License, or +# (at your option) any later version. + +[Unit] +Description=Hibernate +DefaultDependencies=no +Requires=sleep.target +After=sleep.target + +[Service] +Type=oneshot +ExecStart=@rootlibexecdir@/systemd-sleep hibernate diff --git a/units/systemd-kexec.service.in b/units/systemd-kexec.service.in new file mode 100644 index 0000000000..17d0344972 --- /dev/null +++ b/units/systemd-kexec.service.in @@ -0,0 +1,16 @@ +# This file is part of systemd. +# +# systemd is free software; you can redistribute it and/or modify it +# under the terms of the GNU Lesser General Public License as published by +# the Free Software Foundation; either version 2.1 of the License, or +# (at your option) any later version. + +[Unit] +Description=Reboot via kexec +DefaultDependencies=no +Requires=shutdown.target umount.target final.target +After=shutdown.target umount.target final.target + +[Service] +Type=oneshot +ExecStart=@SYSTEMCTL@ --force kexec diff --git a/units/systemd-poweroff.service.in b/units/systemd-poweroff.service.in new file mode 100644 index 0000000000..851a0f9451 --- /dev/null +++ b/units/systemd-poweroff.service.in @@ -0,0 +1,16 @@ +# This file is part of systemd. +# +# systemd is free software; you can redistribute it and/or modify it +# under the terms of the GNU Lesser General Public License as published by +# the Free Software Foundation; either version 2.1 of the License, or +# (at your option) any later version. + +[Unit] +Description=Power-Off +DefaultDependencies=no +Requires=shutdown.target umount.target final.target +After=shutdown.target umount.target final.target + +[Service] +Type=oneshot +ExecStart=@SYSTEMCTL@ --force poweroff diff --git a/units/systemd-random-seed-load.service.in b/units/systemd-random-seed-load.service.in index 8ea575035e..e9156ef086 100644 --- a/units/systemd-random-seed-load.service.in +++ b/units/systemd-random-seed-load.service.in @@ -9,10 +9,9 @@ Description=Load Random Seed Documentation=man:systemd-random-seed-load.service(8) man:random(4) DefaultDependencies=no -Conflicts=shutdown.target -After=systemd-readahead-collect.service systemd-readahead-replay.service systemd-remount-fs.service -Before=sysinit.target shutdown.target RequiresMountsFor=@RANDOM_SEED@ +After=systemd-readahead-collect.service systemd-readahead-replay.service systemd-remount-fs.service +Before=sysinit.target final.target [Service] Type=oneshot diff --git a/units/systemd-random-seed-save.service.in b/units/systemd-random-seed-save.service.in index 05b3c61471..3444d4ce70 100644 --- a/units/systemd-random-seed-save.service.in +++ b/units/systemd-random-seed-save.service.in @@ -9,10 +9,9 @@ Description=Save Random Seed Documentation=man:systemd-random-seed-load.service(8) man:random(4) DefaultDependencies=no -After=systemd-random-seed-load.service -Before=shutdown.target -Conflicts=systemd-random-seed-load.service RequiresMountsFor=@RANDOM_SEED@ +After=systemd-remount-fs.service systemd-random-seed-load.service +Before=final.target [Service] Type=oneshot diff --git a/units/systemd-reboot.service.in b/units/systemd-reboot.service.in new file mode 100644 index 0000000000..e6a8aabd9d --- /dev/null +++ b/units/systemd-reboot.service.in @@ -0,0 +1,16 @@ +# This file is part of systemd. +# +# systemd is free software; you can redistribute it and/or modify it +# under the terms of the GNU Lesser General Public License as published by +# the Free Software Foundation; either version 2.1 of the License, or +# (at your option) any later version. + +[Unit] +Description=Reboot +DefaultDependencies=no +Requires=shutdown.target umount.target final.target +After=shutdown.target umount.target final.target + +[Service] +Type=oneshot +ExecStart=@SYSTEMCTL@ --force reboot diff --git a/units/systemd-suspend.service.in b/units/systemd-suspend.service.in new file mode 100644 index 0000000000..3cf819e476 --- /dev/null +++ b/units/systemd-suspend.service.in @@ -0,0 +1,16 @@ +# This file is part of systemd. +# +# systemd is free software; you can redistribute it and/or modify it +# under the terms of the GNU Lesser General Public License as published by +# the Free Software Foundation; either version 2.1 of the License, or +# (at your option) any later version. + +[Unit] +Description=Suspend +DefaultDependencies=no +Requires=sleep.target +After=sleep.target + +[Service] +Type=oneshot +ExecStart=@rootlibexecdir@/systemd-sleep suspend diff --git a/units/systemd-update-utmp-runlevel.service.in b/units/systemd-update-utmp-runlevel.service.in index 6666dbd790..7b6fbadf12 100644 --- a/units/systemd-update-utmp-runlevel.service.in +++ b/units/systemd-update-utmp-runlevel.service.in @@ -9,8 +9,10 @@ Description=Update UTMP about System Runlevel Changes Documentation=man:utmp(5) DefaultDependencies=no -After=local-fs.target sysinit.target auditd.service runlevel1.target runlevel2.target runlevel3.target runlevel4.target runlevel5.target systemd-tmpfiles-setup.service -Before=poweroff.service reboot.service halt.service +RequiresMountsFor=/var/log/wtmp +After=systemd-remount-fs.service systemd-tmpfiles-setup.service auditd.service +After=runlevel1.target runlevel2.target runlevel3.target runlevel4.target runlevel5.target +Before=final.target [Service] Type=oneshot diff --git a/units/systemd-update-utmp-shutdown.service.in b/units/systemd-update-utmp-shutdown.service.in index 5b726c3688..8615d150b5 100644 --- a/units/systemd-update-utmp-shutdown.service.in +++ b/units/systemd-update-utmp-shutdown.service.in @@ -9,8 +9,10 @@ Description=Update UTMP about System Shutdown Documentation=man:utmp(5) DefaultDependencies=no -After=local-fs.target sysinit.target auditd.service systemd-update-utmp-runlevel.service -Before=poweroff.service reboot.service halt.service +RequiresMountsFor=/var/log/wtmp +After=systemd-remount-fs.service systemd-tmpfiles-setup.service auditd.service +After=systemd-update-utmp-runlevel.service +Before=final.target [Service] Type=oneshot diff --git a/units/user/.gitignore b/units/user/.gitignore index eeb62b32ba..41a74f5461 100644 --- a/units/user/.gitignore +++ b/units/user/.gitignore @@ -1 +1 @@ -exit.service +/systemd-exit.service diff --git a/units/user/exit.service.in b/units/user/exit.service.in deleted file mode 100644 index a114f6c1be..0000000000 --- a/units/user/exit.service.in +++ /dev/null @@ -1,17 +0,0 @@ -# This file is part of systemd. -# -# systemd is free software; you can redistribute it and/or modify it -# under the terms of the GNU Lesser General Public License as published by -# the Free Software Foundation; either version 2.1 of the License, or -# (at your option) any later version. - -[Unit] -Description=Exit the Session -Documentation=man:systemd.special(7) -DefaultDependencies=no -Requires=shutdown.target -After=shutdown.target - -[Service] -Type=oneshot -ExecStart=@SYSTEMCTL@ --user --force exit diff --git a/units/user/exit.target b/units/user/exit.target index 539e03a9aa..b0ad24c488 100644 --- a/units/user/exit.target +++ b/units/user/exit.target @@ -9,8 +9,8 @@ Description=Exit the Session Documentation=man:systemd.special(7) DefaultDependencies=no -Requires=exit.service -After=exit.service +Requires=systemd-exit.service +After=systemd-exit.service AllowIsolate=yes [Install] diff --git a/units/user/systemd-exit.service.in b/units/user/systemd-exit.service.in new file mode 100644 index 0000000000..a114f6c1be --- /dev/null +++ b/units/user/systemd-exit.service.in @@ -0,0 +1,17 @@ +# This file is part of systemd. +# +# systemd is free software; you can redistribute it and/or modify it +# under the terms of the GNU Lesser General Public License as published by +# the Free Software Foundation; either version 2.1 of the License, or +# (at your option) any later version. + +[Unit] +Description=Exit the Session +Documentation=man:systemd.special(7) +DefaultDependencies=no +Requires=shutdown.target +After=shutdown.target + +[Service] +Type=oneshot +ExecStart=@SYSTEMCTL@ --user --force exit -- cgit v1.2.3-54-g00ecf From 8284608198887230a1ac7f6ada9affeed3f437fb Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Mon, 25 Jun 2012 23:00:38 +0200 Subject: man/bootup.xml: Fix grammar by adding missing verb »is« MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- man/bootup.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'man/bootup.xml') diff --git a/man/bootup.xml b/man/bootup.xml index 69f9a273b9..e29c1a0167 100644 --- a/man/bootup.xml +++ b/man/bootup.xml @@ -73,7 +73,7 @@ storage technologies backing them), and then (optionally) jumps back into the initrd code which unmounts/detaches the root file system and the storage - it resides on. As last step the system powered down. + it resides on. As last step the system is powered down. Additional information about the system boot process may be found in -- cgit v1.2.3-54-g00ecf From 5231084b479455e6cc892ec3c37c9f599c5bea58 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Wed, 27 Jun 2012 22:21:35 +0200 Subject: units: add explicit dependency on display-manager.service to graphical.target This replaces the symlink based dependency by an explicit one in the unit file so that we avoid the dangling symlink when no display manager is installed. --- Makefile.am | 9 --------- TODO | 7 ++----- man/bootup.xml | 24 ++++++++++++------------ units/graphical.target | 1 + 4 files changed, 15 insertions(+), 26 deletions(-) (limited to 'man/bootup.xml') diff --git a/Makefile.am b/Makefile.am index 816a8eb4a4..b6b148ed50 100644 --- a/Makefile.am +++ b/Makefile.am @@ -3389,9 +3389,6 @@ if TARGET_FEDORA rm -f display-manager.service single.service && \ $(LN_S) prefdm.service display-manager.service && \ $(LN_S) rescue.service single.service ) - ( cd $(DESTDIR)$(systemunitdir)/graphical.target.wants && \ - rm -f display-manager.service && \ - $(LN_S) $(systemunitdir)/display-manager.service display-manager.service ) endif if TARGET_MANDRIVA @@ -3400,9 +3397,6 @@ if TARGET_MANDRIVA $(LN_S) prefdm.service display-manager.service && \ $(LN_S) prefdm.service dm.service && \ $(LN_S) rescue.service single.service ) - ( cd $(DESTDIR)$(systemunitdir)/graphical.target.wants && \ - rm -f display-manager.service && \ - $(LN_S) $(systemunitdir)/display-manager.service display-manager.service ) endif if TARGET_DEBIAN_OR_UBUNTU @@ -3422,9 +3416,6 @@ if TARGET_MAGEIA rm -f display-manager.service && \ $(LN_S) prefdm.service display-manager.service && \ $(LN_S) prefdm.service dm.service ) - ( cd $(DESTDIR)$(systemunitdir)/graphical.target.wants && \ - rm -f display-manager.service && \ - $(LN_S) $(systemunitdir)/display-manager.service display-manager.service ) endif install-exec-hook: $(INSTALL_EXEC_HOOKS) diff --git a/TODO b/TODO index cfd7dd09da..c22f1f5579 100644 --- a/TODO +++ b/TODO @@ -25,6 +25,8 @@ Bugfixes: Features: +* systemctl list-unit-files appears to be broken for symlinked units in /usr/lib + * maybe allow services with ExecStop= set, but no ExecStart=? * efi: implement /forcefsck as uefi variables thus not requiring file system altering to trigger a file system check @@ -66,8 +68,6 @@ Features: * readahead: when bumping /sys readahead variable save mtime and compare later to detect changes -* Document boot options such as forcefsck - * (attempt to) make Debianites happy: - implement .d/ auto includes for unit files - add syntax to reset ExecStart= lists (and similar) @@ -165,8 +165,6 @@ Features: * support chrony in addition to ntpd in timedated -* document crypttab(5) - * There's currently no way to cancel fsck (used to be possible via C-c or c on the console) * journal: sanely deal with entries which are larger than the individual file size, but where the componets would fit @@ -310,7 +308,6 @@ Features: - resource control in systemd - inhibiting - testing with Harald's awesome test kit - - the Documentation= * allow port=0 in .socket units diff --git a/man/bootup.xml b/man/bootup.xml index e29c1a0167..ed72acfda9 100644 --- a/man/bootup.xml +++ b/man/bootup.xml @@ -147,18 +147,18 @@ v basic.target | - _________________/| emergency.service - / | | - | | v - v v emergency.target - (various system (various system - services services) - required for | - graphical UIs) v - | multi-user.target - | | - | _________________/ - |/ + __________________________________/| emergency.service + / | | | + | | | v + v v v emergency.target + display- (various system (various system + manager.service services services) + | required for | + | graphical UIs) v + | | multi-user.target + | | | + \_______________ | _________________/ + \|/ v graphical.target diff --git a/units/graphical.target b/units/graphical.target index 7c6ebd4789..65f2521d9e 100644 --- a/units/graphical.target +++ b/units/graphical.target @@ -11,6 +11,7 @@ Documentation=man:systemd.special(7) Requires=multi-user.target After=multi-user.target Conflicts=rescue.target +Wants=display-manager.service AllowIsolate=yes [Install] -- cgit v1.2.3-54-g00ecf From 49f43d5f91a99b23f745726aa351d8f159774357 Mon Sep 17 00:00:00 2001 From: Ville Skyttä Date: Sun, 15 Jul 2012 11:41:40 +0300 Subject: Spelling fixes. --- NEWS | 2 +- README | 2 +- TODO | 2 +- man/bootup.xml | 2 +- man/journalctl.xml | 8 ++++---- man/journald.conf.xml | 4 ++-- man/sd_journal_open.xml | 2 +- man/sd_journal_print.xml | 2 +- man/sd_journal_seek_head.xml | 10 +++++----- man/sd_seat_get_active.xml | 2 +- man/systemctl.xml | 6 +++--- man/systemd-delta.xml | 2 +- man/systemd-inhibit.xml | 2 +- man/systemd-readahead-replay.service.xml | 2 +- man/systemd.conf.xml | 2 +- man/systemd.exec.xml | 10 +++++----- src/core/load-fragment.c | 2 +- src/core/shutdown.c | 2 +- src/core/unit.h | 2 +- src/journal/lookup3.c | 6 +++--- src/journal/sd-journal.c | 2 +- src/shared/dbus-common.c | 2 +- units/syslog.target | 2 +- 23 files changed, 39 insertions(+), 39 deletions(-) (limited to 'man/bootup.xml') diff --git a/NEWS b/NEWS index 7e058d8a4e..b9c452958b 100644 --- a/NEWS +++ b/NEWS @@ -233,7 +233,7 @@ CHANGES WITH 183: to be used as drop-in files. * systemd and logind now handle system sleep states, in - particulary suspending and hibernating. + particular suspending and hibernating. * logind now implements a sleep/shutdown/idle inhibiting logic suitable for a variety of uses. Soonishly Lennart will blog diff --git a/README b/README index d23a3d6d38..dc8e5f5f02 100644 --- a/README +++ b/README @@ -71,7 +71,7 @@ REQUIREMENTS: includes systemd-hostnamed. Note that D-Bus can link against libsystemd-login.so, which - results in a cyclic build dependency. To accomodate for this + results in a cyclic build dependency. To accommodate for this please build D-Bus without systemd first, then build systemd, then rebuild D-Bus with systemd support. diff --git a/TODO b/TODO index 1ec59b2f53..ae9fbc2305 100644 --- a/TODO +++ b/TODO @@ -47,7 +47,7 @@ Features: * man: clarify that time-sync.target is not only sysv compat but also useful otherwise. Same for similar targets -* journalctl should complain if run with uid != 0 and no persistant logs exist +* journalctl should complain if run with uid != 0 and no persistent logs exist * .device aliases need to be implemented with the "following" logic, probably. diff --git a/man/bootup.xml b/man/bootup.xml index ed72acfda9..760a5a4c29 100644 --- a/man/bootup.xml +++ b/man/bootup.xml @@ -53,7 +53,7 @@ A number of different components are involved in the system boot. Immediately after power-up, the system BIOS will do minimal hardware initialization, and hand - control over to a boot loader stored on a persistant + control over to a boot loader stored on a persistent storage device. This boot loader will then invoke an OS kernel from disk (or the network). In the Linux case this kernel now (optionally) extracts and diff --git a/man/journalctl.xml b/man/journalctl.xml index f314fb6d26..05c8703d28 100644 --- a/man/journalctl.xml +++ b/man/journalctl.xml @@ -141,7 +141,7 @@ Show only most recent - journal entries, and continously print + journal entries, and continuously print new entries as they are appended to the journal. @@ -189,9 +189,9 @@ is very similar but shows monotonic timestamps instead of wallclock timestamps. verbose - shows the full structered entry items + shows the full structured entry items with all - fiels. export + fields. export serializes the journal into a binary (but mostly text-based) stream suitable for backups and network @@ -209,7 +209,7 @@ Suppresses any warning - message regarding inaccessable system + message regarding inaccessible system journals when run as normal user. diff --git a/man/journald.conf.xml b/man/journald.conf.xml index 36227092bb..d7caea83cc 100644 --- a/man/journald.conf.xml +++ b/man/journald.conf.xml @@ -174,7 +174,7 @@ influences the granularity in which disk space is made available through rotation, i.e. deletion of historic - data. Defaults to one eigth of the + data. Defaults to one eighth of the values configured with SystemMaxUse= and RuntimeMaxUse=, so @@ -317,7 +317,7 @@ directory /var/log/journal is not created if needed, so that its - existance controls where log data + existence controls where log data goes. none turns off all storage, all log data received will be dropped. Forwarding to other diff --git a/man/sd_journal_open.xml b/man/sd_journal_open.xml index ffd9a2c481..b99c67da46 100644 --- a/man/sd_journal_open.xml +++ b/man/sd_journal_open.xml @@ -92,7 +92,7 @@ only journal files generated on the local machine will be opened. SD_JOURNAL_RUNTIME_ONLY makes sure only volatile journal files will be opened, - excluding those which are stored on persistant + excluding those which are stored on persistent storage. SD_JOURNAL_SYSTEM_ONLY will ensure that only journal files of system services and the kernel (in opposition to user session processes) will diff --git a/man/sd_journal_print.xml b/man/sd_journal_print.xml index 05c1ebea77..dfe99192e7 100644 --- a/man/sd_journal_print.xml +++ b/man/sd_journal_print.xml @@ -172,7 +172,7 @@ sd_journal_send("MESSAGE=Hello World, this is PID %lu!", (unsigned long) getpid( syslog3 and and sd_journal_print() may - largely be used interchangably + largely be used interchangeably functionality-wise. However, note that log messages logged via the former take a different path to the journal server than the later, and hence global diff --git a/man/sd_journal_seek_head.xml b/man/sd_journal_seek_head.xml index b6a9a731c1..f8a4eb1d20 100644 --- a/man/sd_journal_seek_head.xml +++ b/man/sd_journal_seek_head.xml @@ -92,7 +92,7 @@ sd_journal_seek_head() seeks to the beginning of the journal, i.e. the oldest - avilable entry. + available entry. Similar, sd_journal_seek_tail() may be @@ -110,7 +110,7 @@ (wallclock) timestamp, i.e. CLOCK_REALTIME. Note that the realtime clock is not necessary monotonic. If a realtime timestamp is ambiguous it is not defined - which position is seeked to. + which position is sought to. sd_journal_seek_cursor() seeks to the entry located at the specified cursor @@ -125,12 +125,12 @@ may be retrieved via sd_journal_get_data3. If no entry exists that matches exactly the specified - seek address the next closest is seeked to. If + seek address the next closest is sought to. If sd_journal_next3 - is used the closest following entry will be seeked to, + is used the closest following entry will be sought to, if sd_journal_previous3 - is used the closest preceeding entry is seeked + is used the closest preceding entry is sought to. diff --git a/man/sd_seat_get_active.xml b/man/sd_seat_get_active.xml index fa47378577..801c16a4bb 100644 --- a/man/sd_seat_get_active.xml +++ b/man/sd_seat_get_active.xml @@ -118,7 +118,7 @@ sd_seat_can_multi_session() may be used to determine whether a specific seat is capable of multi-session, i.e. allows multiple login - sessions in parallel (whith only one being active at a + sessions in parallel (with only one being active at a time). sd_seat_can_tty() may be diff --git a/man/systemctl.xml b/man/systemctl.xml index bf31b6114d..3c0a7950a0 100644 --- a/man/systemctl.xml +++ b/man/systemctl.xml @@ -447,7 +447,7 @@ When used with - status continously + status continuously prints new journal entries as they are appended to the journal. @@ -1202,10 +1202,10 @@ directory, and the path to the new system manager binary below it to execute as PID 1. If the latter is - ommitted or the empty string, a + omitted or the empty string, a systemd binary will automatically be searched for and used as init. If the - system manager path is ommitted or + system manager path is omitted or equal the empty string the state of the initrd's system manager process is passed to the main system manager, diff --git a/man/systemd-delta.xml b/man/systemd-delta.xml index 9ded28be43..4e57d18fcc 100644 --- a/man/systemd-delta.xml +++ b/man/systemd-delta.xml @@ -155,7 +155,7 @@ When showing modified files, when a file is overridden show a - diff aswell. This option takes a + diff as well. This option takes a boolean argument. diff --git a/man/systemd-inhibit.xml b/man/systemd-inhibit.xml index 81ec9ef9ab..e19892b3f1 100644 --- a/man/systemd-inhibit.xml +++ b/man/systemd-inhibit.xml @@ -110,7 +110,7 @@ inhibiting reboot/power-off/halt/kexec, suspending/hibernating, resp. the - automatic idle detection. If ommitted + automatic idle detection. If omitted defaults to idle:sleep:shutdown, i.e. takes all possible diff --git a/man/systemd-readahead-replay.service.xml b/man/systemd-readahead-replay.service.xml index e37b1a9edf..b56fdb8100 100644 --- a/man/systemd-readahead-replay.service.xml +++ b/man/systemd-readahead-replay.service.xml @@ -85,7 +85,7 @@ and systemd-readahead-replay.service are activated at boot so that access patterns from the - preceeding boot are replayed and new data collected + preceding boot are replayed and new data collected for the subsequent boot. However, on read-only media where the collected data cannot be stored it might be a good idea to disable diff --git a/man/systemd.conf.xml b/man/systemd.conf.xml index fb038eaf6d..804a50ead6 100644 --- a/man/systemd.conf.xml +++ b/man/systemd.conf.xml @@ -125,7 +125,7 @@ hierarchy. By default systemd will mount all controllers which are enabled in the kernel in individual - hierachies, with the exception of + hierarchies, with the exception of those listed in this setting. Takes a space separated list of comma separated controller names, in order diff --git a/man/systemd.exec.xml b/man/systemd.exec.xml index 8d3b3da22e..eff75d033a 100644 --- a/man/systemd.exec.xml +++ b/man/systemd.exec.xml @@ -931,18 +931,18 @@ BlockIOWriteBandwidth= Set the per-device - overall block IO bandwith limit for + overall block IO bandwidth limit for the executed processes. Takes a space separated pair of a file path and a - bandwith value (in bytes per second) + bandwidth value (in bytes per second) to specify the device specific bandwidth. The file path may be specified as path to a block device node or as any other file in which case the backing block device of the file system of the file is determined. - If the bandwith is suffixed with K, M, - G, or T the specified bandwith is + If the bandwidth is suffixed with K, M, + G, or T the specified bandwidth is parsed as Kilobytes, Megabytes, Gigabytes, resp. Terabytes (Example: "/dev/disk/by-path/pci-0000:00:1f.2-scsi-0:0:0:0 @@ -951,7 +951,7 @@ and blkio.write_bps_device control group attributes. Use this - option multiple times to set bandwith + option multiple times to set bandwidth limits for multiple devices. For details about these control group attributes see level0, f, direction == DIRECTION_DOWN ? cp+1 : cp-1, direction, ret, offset); } diff --git a/src/shared/dbus-common.c b/src/shared/dbus-common.c index ddb50b1eca..3f5ce97680 100644 --- a/src/shared/dbus-common.c +++ b/src/shared/dbus-common.c @@ -1156,7 +1156,7 @@ DBusHandlerResult bus_exit_idle_filter(DBusConnection *bus, DBusMessage *m, void assert(m); assert(remain_until); - /* Everytime we get a new message we reset out timeout */ + /* Every time we get a new message we reset out timeout */ *remain_until = now(CLOCK_MONOTONIC) + DEFAULT_EXIT_USEC; if (dbus_message_is_signal(m, DBUS_INTERFACE_LOCAL, "Disconnected")) diff --git a/units/syslog.target b/units/syslog.target index 87ac886df3..423fef30ad 100644 --- a/units/syslog.target +++ b/units/syslog.target @@ -15,5 +15,5 @@ Documentation=http://www.freedesktop.org/wiki/Software/systemd/syslog # Avoid that we conflict with shutdown.target, so that we can stay # until the very end and do not cancel shutdown.target if we should -# hapen to be activated very late. +# happen to be activated very late. DefaultDependencies=no -- cgit v1.2.3-54-g00ecf From 34511ca7b166b0e89d08ff9870b0cf2624a7815f Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Mon, 16 Jul 2012 18:08:25 +0200 Subject: man: reword man page titles Make sure the man page titles are similar in style and capitalization so that our man page index looks pretty. --- man/bootup.xml | 2 +- man/daemon.xml | 2 +- man/kernel-command-line.xml | 2 +- man/locale.conf.xml | 2 +- man/machine-id.xml | 2 +- man/sd-journal.xml | 2 +- man/sd_booted.xml | 2 +- man/sd_listen_fds.xml | 2 +- man/sd_notify.xml | 2 +- man/systemd-ask-password-console.service.xml | 3 +-- man/systemd-fstab-generator.xml | 2 +- man/systemd-halt.service.xml | 2 +- man/systemd-hostnamed.service.xml | 2 +- man/systemd-initctl.service.xml | 2 +- man/systemd-journald.service.xml | 2 +- man/systemd-localed.service.xml | 2 +- man/systemd-logind.service.xml | 2 +- man/systemd-machine-id-setup.xml | 2 +- man/systemd-notify.xml | 2 +- man/systemd-readahead-replay.service.xml | 2 +- man/systemd-remount-fs.service.xml | 2 +- man/systemd-shutdownd.service.xml | 2 +- man/systemd-suspend.service.xml | 2 +- man/systemd-timedated.service.xml | 2 +- man/systemd-tmpfiles.xml | 2 +- man/systemd-update-utmp-runlevel.service.xml | 4 ++-- man/systemd-user-sessions.service.xml | 2 +- man/systemd.automount.xml | 2 +- man/systemd.conf.xml | 2 +- man/systemd.device.xml | 2 +- man/systemd.exec.xml | 2 +- man/systemd.mount.xml | 2 +- man/systemd.path.xml | 2 +- man/systemd.service.xml | 2 +- man/systemd.snapshot.xml | 2 +- man/systemd.socket.xml | 2 +- man/systemd.swap.xml | 2 +- man/systemd.target.xml | 2 +- man/systemd.timer.xml | 2 +- man/systemd.unit.xml | 2 +- man/systemd.xml | 2 +- man/vconsole.conf.xml | 2 +- 42 files changed, 43 insertions(+), 44 deletions(-) (limited to 'man/bootup.xml') diff --git a/man/bootup.xml b/man/bootup.xml index 760a5a4c29..ae70c953f5 100644 --- a/man/bootup.xml +++ b/man/bootup.xml @@ -44,7 +44,7 @@ bootup - The System Bootup Process + System bootup process diff --git a/man/daemon.xml b/man/daemon.xml index 83143dc4b2..9d43353f90 100644 --- a/man/daemon.xml +++ b/man/daemon.xml @@ -44,7 +44,7 @@ daemon - Writing and Packaging System Daemons + Writing and packaging system daemons diff --git a/man/kernel-command-line.xml b/man/kernel-command-line.xml index d5c3f34c6f..ae705eed0c 100644 --- a/man/kernel-command-line.xml +++ b/man/kernel-command-line.xml @@ -44,7 +44,7 @@ kernel-command-line - Kernel Command Line Parameters + Kernel command line parameters diff --git a/man/locale.conf.xml b/man/locale.conf.xml index b90efea50c..2cbcdc66de 100644 --- a/man/locale.conf.xml +++ b/man/locale.conf.xml @@ -44,7 +44,7 @@ locale.conf - configuration file for locale settings + Configuration file for locale settings diff --git a/man/machine-id.xml b/man/machine-id.xml index 50295a8cd7..7d424b705b 100644 --- a/man/machine-id.xml +++ b/man/machine-id.xml @@ -44,7 +44,7 @@ machine-id - local machine ID configuration file + Local machine ID configuration file diff --git a/man/sd-journal.xml b/man/sd-journal.xml index a771f0236f..b6241a1767 100644 --- a/man/sd-journal.xml +++ b/man/sd-journal.xml @@ -44,7 +44,7 @@ sd-journal - APIs for submitting and querying log entries to and from the Journal + APIs for submitting and querying log entries to and from the journal diff --git a/man/sd_booted.xml b/man/sd_booted.xml index 23caf5bf1a..83cbd6b20a 100644 --- a/man/sd_booted.xml +++ b/man/sd_booted.xml @@ -44,7 +44,7 @@ sd_booted - Test whether the system is running the systemd init system. + Test whether the system is running the systemd init system diff --git a/man/sd_listen_fds.xml b/man/sd_listen_fds.xml index 5e906870c7..f6a9497d56 100644 --- a/man/sd_listen_fds.xml +++ b/man/sd_listen_fds.xml @@ -45,7 +45,7 @@ sd_listen_fds SD_LISTEN_FDS_START - Check for file descriptors passed by the init system. + Check for file descriptors passed by the system manager diff --git a/man/sd_notify.xml b/man/sd_notify.xml index 1cd5b0aa7e..606ee1e57f 100644 --- a/man/sd_notify.xml +++ b/man/sd_notify.xml @@ -45,7 +45,7 @@ sd_notify sd_notifyf - Notify init system about start-up completion and other daemon status changes + Notify service manager about start-up completion and other daemon status changes diff --git a/man/systemd-ask-password-console.service.xml b/man/systemd-ask-password-console.service.xml index 0baf882c43..6ca94360ac 100644 --- a/man/systemd-ask-password-console.service.xml +++ b/man/systemd-ask-password-console.service.xml @@ -46,8 +46,7 @@ systemd-ask-password-wall.service systemd-ask-password-wall.path Query the user for system passwords on the - console and via - wall1 + console and via wall diff --git a/man/systemd-fstab-generator.xml b/man/systemd-fstab-generator.xml index a526bcfdb2..785febd6ce 100644 --- a/man/systemd-fstab-generator.xml +++ b/man/systemd-fstab-generator.xml @@ -42,7 +42,7 @@ systemd-fstab-generator - Unit generator for /etc/fstab + Unit generator for /etc/fstab diff --git a/man/systemd-halt.service.xml b/man/systemd-halt.service.xml index 6957fb984e..ab20f2be45 100644 --- a/man/systemd-halt.service.xml +++ b/man/systemd-halt.service.xml @@ -48,7 +48,7 @@ systemd-reboot.service systemd-kexec.service systemd-shutdown - systemd System Shutdown Logic + System shutdown logic diff --git a/man/systemd-hostnamed.service.xml b/man/systemd-hostnamed.service.xml index f98663fea5..9fee2a096d 100644 --- a/man/systemd-hostnamed.service.xml +++ b/man/systemd-hostnamed.service.xml @@ -45,7 +45,7 @@ systemd-hostnamed.service systemd-hostnamed - systemd Hostname Bus Mechanism + Hostname bus mechanism diff --git a/man/systemd-initctl.service.xml b/man/systemd-initctl.service.xml index d3b537d91a..eda6459b50 100644 --- a/man/systemd-initctl.service.xml +++ b/man/systemd-initctl.service.xml @@ -46,7 +46,7 @@ systemd-initctl.service systemd-initctl.socket systemd-initctl - systemd /dev/initctl Compatibility + /dev/initctl compatibility diff --git a/man/systemd-journald.service.xml b/man/systemd-journald.service.xml index 8ae24d40b3..90f9290276 100644 --- a/man/systemd-journald.service.xml +++ b/man/systemd-journald.service.xml @@ -46,7 +46,7 @@ systemd-journald.service systemd-journald.socket systemd-journald - systemd Journal Service + Journal service diff --git a/man/systemd-localed.service.xml b/man/systemd-localed.service.xml index 121508eea5..f0f069b936 100644 --- a/man/systemd-localed.service.xml +++ b/man/systemd-localed.service.xml @@ -45,7 +45,7 @@ systemd-localed.service systemd-localed - systemd Locale Bus Mechanism + Locale bus mechanism diff --git a/man/systemd-logind.service.xml b/man/systemd-logind.service.xml index 436c2772c3..00f34051a3 100644 --- a/man/systemd-logind.service.xml +++ b/man/systemd-logind.service.xml @@ -45,7 +45,7 @@ systemd-logind.service systemd-logind - systemd Login Manager + Login manager diff --git a/man/systemd-machine-id-setup.xml b/man/systemd-machine-id-setup.xml index 36e6c55335..25fb63af2d 100644 --- a/man/systemd-machine-id-setup.xml +++ b/man/systemd-machine-id-setup.xml @@ -44,7 +44,7 @@ systemd-machine-id-setup - Initialize the machine ID in /etc/machine-id + Initialize the machine ID in /etc/machine-id diff --git a/man/systemd-notify.xml b/man/systemd-notify.xml index e6c6a5946e..b03492c5c1 100644 --- a/man/systemd-notify.xml +++ b/man/systemd-notify.xml @@ -44,7 +44,7 @@ systemd-notify - Notify init system about start-up completion and other daemon status changes + Notify service manager about start-up completion and other daemon status changes diff --git a/man/systemd-readahead-replay.service.xml b/man/systemd-readahead-replay.service.xml index b56fdb8100..66d253454b 100644 --- a/man/systemd-readahead-replay.service.xml +++ b/man/systemd-readahead-replay.service.xml @@ -48,7 +48,7 @@ systemd-readahead-done.service systemd-readahead-done.timer systemd-readahead - systemd Disk Read Ahead Logic + Disk read ahead logic diff --git a/man/systemd-remount-fs.service.xml b/man/systemd-remount-fs.service.xml index c1df5e6f43..d920c0c400 100644 --- a/man/systemd-remount-fs.service.xml +++ b/man/systemd-remount-fs.service.xml @@ -43,7 +43,7 @@ systemd-remount-fs.service systemd-remount-fs - Remount Root and Kernel File Systems + Remount root and kernel file systems diff --git a/man/systemd-shutdownd.service.xml b/man/systemd-shutdownd.service.xml index c4ace482a6..c1b8ef7a49 100644 --- a/man/systemd-shutdownd.service.xml +++ b/man/systemd-shutdownd.service.xml @@ -46,7 +46,7 @@ systemd-shutdownd.service systemd-shutdownd.socket systemd-shutdownd - systemd scheduled shutdown daemon + Scheduled shutdown service diff --git a/man/systemd-suspend.service.xml b/man/systemd-suspend.service.xml index 1ae742bcd8..d3e08a8f1d 100644 --- a/man/systemd-suspend.service.xml +++ b/man/systemd-suspend.service.xml @@ -46,7 +46,7 @@ systemd-suspend.service systemd-hibernate.service systemd-sleep - systemd System Sleep State Logic + System sleep state logic diff --git a/man/systemd-timedated.service.xml b/man/systemd-timedated.service.xml index 4bc5d9e8cb..56450482d7 100644 --- a/man/systemd-timedated.service.xml +++ b/man/systemd-timedated.service.xml @@ -45,7 +45,7 @@ systemd-timedated.service systemd-timedated - systemd Time and Date Bus Mechanism + Time and date bus mechanism diff --git a/man/systemd-tmpfiles.xml b/man/systemd-tmpfiles.xml index 63c84910f0..22744c7c41 100644 --- a/man/systemd-tmpfiles.xml +++ b/man/systemd-tmpfiles.xml @@ -48,7 +48,7 @@ systemd-tmpfiles-clean.service systemd-tmpfiles-clean.timer Creates, deletes and cleans up volatile - and temporary files and directories. + and temporary files and directories diff --git a/man/systemd-update-utmp-runlevel.service.xml b/man/systemd-update-utmp-runlevel.service.xml index fee72768cb..0e19581f98 100644 --- a/man/systemd-update-utmp-runlevel.service.xml +++ b/man/systemd-update-utmp-runlevel.service.xml @@ -44,8 +44,8 @@ systemd-update-utmp-runlevel.service systemd-update-utmp-shutdown.service systemd-update-utmp - Write audit an utmp updates at runlevel - changes and shutdown. + Write audit and utmp updates at runlevel + changes and shutdown diff --git a/man/systemd-user-sessions.service.xml b/man/systemd-user-sessions.service.xml index 5c65eb1618..9214ec9c35 100644 --- a/man/systemd-user-sessions.service.xml +++ b/man/systemd-user-sessions.service.xml @@ -43,7 +43,7 @@ systemd-user-sessions.service systemd-user-sessions - Permit user logins after boot, prohibit user logins at shutdown. + Permit user logins after boot, prohibit user logins at shutdown diff --git a/man/systemd.automount.xml b/man/systemd.automount.xml index bf4b5d8214..43006d4dc9 100644 --- a/man/systemd.automount.xml +++ b/man/systemd.automount.xml @@ -44,7 +44,7 @@ systemd.automount - systemd automount configuration files + Automount unit configuration diff --git a/man/systemd.conf.xml b/man/systemd.conf.xml index 804a50ead6..7dc5cc13ce 100644 --- a/man/systemd.conf.xml +++ b/man/systemd.conf.xml @@ -44,7 +44,7 @@ systemd.conf - systemd manager configuration file + System and service manager configuration file diff --git a/man/systemd.device.xml b/man/systemd.device.xml index 78cddd6518..7c05ab035b 100644 --- a/man/systemd.device.xml +++ b/man/systemd.device.xml @@ -44,7 +44,7 @@ systemd.device - systemd device configuration files + Device unit configuration diff --git a/man/systemd.exec.xml b/man/systemd.exec.xml index 291178679d..c04db12e3b 100644 --- a/man/systemd.exec.xml +++ b/man/systemd.exec.xml @@ -44,7 +44,7 @@ systemd.exec - systemd execution environment configuration + Execution environment configuration diff --git a/man/systemd.mount.xml b/man/systemd.mount.xml index 4bf652323e..105afb41ea 100644 --- a/man/systemd.mount.xml +++ b/man/systemd.mount.xml @@ -44,7 +44,7 @@ systemd.mount - systemd mount configuration files + Mount unit configuration diff --git a/man/systemd.path.xml b/man/systemd.path.xml index 2d02318f19..af230291ed 100644 --- a/man/systemd.path.xml +++ b/man/systemd.path.xml @@ -44,7 +44,7 @@ systemd.path - systemd path configuration files + Path unit configuration diff --git a/man/systemd.service.xml b/man/systemd.service.xml index 491c3df1cb..38a4035f67 100644 --- a/man/systemd.service.xml +++ b/man/systemd.service.xml @@ -44,7 +44,7 @@ systemd.service - systemd service configuration files + Service unit configuration diff --git a/man/systemd.snapshot.xml b/man/systemd.snapshot.xml index db3343af67..b432682a48 100644 --- a/man/systemd.snapshot.xml +++ b/man/systemd.snapshot.xml @@ -44,7 +44,7 @@ systemd.snapshot - systemd snapshot units + Snapshot unit configuration diff --git a/man/systemd.socket.xml b/man/systemd.socket.xml index d3762cd63d..5ca1c7a7c1 100644 --- a/man/systemd.socket.xml +++ b/man/systemd.socket.xml @@ -44,7 +44,7 @@ systemd.socket - systemd socket configuration files + Socket unit configuration diff --git a/man/systemd.swap.xml b/man/systemd.swap.xml index beb8dba210..aaf77f8396 100644 --- a/man/systemd.swap.xml +++ b/man/systemd.swap.xml @@ -44,7 +44,7 @@ systemd.swap - systemd swap configuration files + Swap unit configuration diff --git a/man/systemd.target.xml b/man/systemd.target.xml index 61eeb7fd8a..d1f4d22674 100644 --- a/man/systemd.target.xml +++ b/man/systemd.target.xml @@ -44,7 +44,7 @@ systemd.target - systemd target configuration files + Target unit configuration diff --git a/man/systemd.timer.xml b/man/systemd.timer.xml index 0b204353f4..6fc26a5536 100644 --- a/man/systemd.timer.xml +++ b/man/systemd.timer.xml @@ -44,7 +44,7 @@ systemd.timer - systemd timer configuration files + Timer unit configuration diff --git a/man/systemd.unit.xml b/man/systemd.unit.xml index 4a2e9c3bf9..286862006a 100644 --- a/man/systemd.unit.xml +++ b/man/systemd.unit.xml @@ -44,7 +44,7 @@ systemd.unit - systemd unit configuration files + Unit configuration diff --git a/man/systemd.xml b/man/systemd.xml index a184b1a401..c598a896f0 100644 --- a/man/systemd.xml +++ b/man/systemd.xml @@ -45,7 +45,7 @@ systemd init - systemd System and Service Manager + systemd system and service manager diff --git a/man/vconsole.conf.xml b/man/vconsole.conf.xml index 8617721664..e23a980232 100644 --- a/man/vconsole.conf.xml +++ b/man/vconsole.conf.xml @@ -44,7 +44,7 @@ vconsole.conf - configuration file for the virtual console + Configuration file for the virtual console -- cgit v1.2.3-54-g00ecf From c53158818d8cdaf46b3f1b5299b9bda118a1043f Mon Sep 17 00:00:00 2001 From: Thomas Hindoe Paaboel Andersen Date: Tue, 4 Sep 2012 19:24:16 +0200 Subject: man: fix a bunch of typos in docs https://bugs.freedesktop.org/show_bug.cgi?id=54501 --- man/bootup.xml | 2 +- man/crypttab.xml | 8 ++++---- man/daemon.xml | 10 +++++----- man/kernel-command-line.xml | 2 +- man/locale.conf.xml | 2 +- man/pam_systemd.xml | 4 ++-- man/sd_journal_print.xml | 2 +- man/sd_seat_get_active.xml | 2 +- man/systemctl.xml | 6 +++--- man/systemd.device.xml | 2 +- man/systemd.exec.xml | 6 +++--- man/systemd.service.xml | 12 ++++++------ man/systemd.socket.xml | 8 ++++---- man/systemd.unit.xml | 2 +- src/core/dbus-unit.c | 2 +- src/core/transaction.c | 2 +- src/core/unit.c | 2 +- src/core/unit.h | 2 +- src/journal/journal-file.c | 2 +- src/journal/lookup3.c | 2 +- src/journal/mmap-cache.c | 2 +- src/libudev/libudev-device.c | 2 +- src/udev/udevd.c | 2 +- test/test-functions | 2 +- 24 files changed, 44 insertions(+), 44 deletions(-) (limited to 'man/bootup.xml') diff --git a/man/bootup.xml b/man/bootup.xml index ae70c953f5..4cc4bafab7 100644 --- a/man/bootup.xml +++ b/man/bootup.xml @@ -111,7 +111,7 @@ target units are available, as listed on systemd.special7. - The follow chart is a structural overview of + The following chart is a structural overview of these well-known units and their position in the boot-up logic. The arrows describe which units are pulled in and ordered before which other units. Units diff --git a/man/crypttab.xml b/man/crypttab.xml index 8711272a87..2a839944dc 100644 --- a/man/crypttab.xml +++ b/man/crypttab.xml @@ -175,7 +175,7 @@ verify - If the the encryption + If the encryption password is read from console, it has to be entered twice (to prevent typos). @@ -217,9 +217,9 @@ timeout= Specify the timeout - for querying for a password. If not - unit is specified in - seconds. Supported units are s, ms, + for querying for a password. If no + unit is specified seconds is used. + Supported units are s, ms, us, min, h, d. diff --git a/man/daemon.xml b/man/daemon.xml index 9d43353f90..e3c038e46a 100644 --- a/man/daemon.xml +++ b/man/daemon.xml @@ -181,11 +181,11 @@ exit() in the original process. The process that invoked the daemon must be able to - rely that this + rely on that this exit() happens after initialization is complete and all external communication channels - established and + are established and accessible. @@ -196,7 +196,7 @@ compatibility with SysV systems should implement the scheme pointed out above. However, it is recommended to make this - behaviour optional and configurable via a + behavior optional and configurable via a command line argument, to ease debugging as well as to simplify integration into systems using systemd. @@ -271,7 +271,7 @@ for details. As much as possible, - rely on the init systemd's + rely on the init system's functionality to limit the access of the daemon to files, services and other resources. i.e. in the case of @@ -462,7 +462,7 @@ New-style daemons which support socket activation must be able to receive their - sockets from the init system, instead of of + sockets from the init system, instead of creating and binding them themselves. For details about the programming interfaces for this scheme provided by systemd see diff --git a/man/kernel-command-line.xml b/man/kernel-command-line.xml index cfc9b8599e..27f0d4036f 100644 --- a/man/kernel-command-line.xml +++ b/man/kernel-command-line.xml @@ -93,7 +93,7 @@ Parameters understood by the system and service manager - to control system behaviour. For details see + to control system behavior. For details see systemd1. diff --git a/man/locale.conf.xml b/man/locale.conf.xml index 2cbcdc66de..06c0af0bf7 100644 --- a/man/locale.conf.xml +++ b/man/locale.conf.xml @@ -117,7 +117,7 @@ LC_TELEPHONE=, LC_MEASUREMENT=, LC_IDENTIFICATION=. Note that - LC_ALL may not be be configured in + LC_ALL may not be configured in this file. For details about the meaning and semantics of these settings, refer to locale7. diff --git a/man/pam_systemd.xml b/man/pam_systemd.xml index f2c1ab8ca6..27edea7779 100644 --- a/man/pam_systemd.xml +++ b/man/pam_systemd.xml @@ -157,7 +157,7 @@ listed in this argument will not be subject to the effect of . Note - that that this option takes precedence + that this option takes precedence over , and hence whatever is listed for @@ -272,7 +272,7 @@ in again, the directory contents will have been lost in between, but applications should not rely on this - behaviour and must be able to deal with + behavior and must be able to deal with stale files. To store session-private data in this directory the user should include the value of $XDG_SESSION_ID diff --git a/man/sd_journal_print.xml b/man/sd_journal_print.xml index c03762ac2c..41414bbc09 100644 --- a/man/sd_journal_print.xml +++ b/man/sd_journal_print.xml @@ -123,7 +123,7 @@ object of type va_list (see stdarg3 for more information) instead of the format string. It - is otherwise equivalent in behaviour. + is otherwise equivalent in behavior. sd_journal_send() may be used to submit structured log entries to the system diff --git a/man/sd_seat_get_active.xml b/man/sd_seat_get_active.xml index 801c16a4bb..778f9aeaf9 100644 --- a/man/sd_seat_get_active.xml +++ b/man/sd_seat_get_active.xml @@ -93,7 +93,7 @@ a seat, if there is any. Returns the session identifier and the user identifier of the Unix user the session is belonging to. Either the session or the - user identifier parameter can be be passed NULL, in + user identifier parameter can be passed NULL, in case only one of the parameters shall be queried. The returned string needs to be freed with the libc free3 diff --git a/man/systemctl.xml b/man/systemctl.xml index c5fae825aa..fedc588766 100644 --- a/man/systemctl.xml +++ b/man/systemctl.xml @@ -1107,7 +1107,7 @@ mounted read-only, immediately followed by the system halt. If is specified - twice the the operation is immediately + twice the operation is immediately executed without terminating any processes or unmounting any file systems. This may result in data @@ -1128,7 +1128,7 @@ unmounted or mounted read-only, immediately followed by the powering off. If is - specified twice the the operation is + specified twice the operation is immediately executed without terminating any processes or unmounting any file systems. This may @@ -1149,7 +1149,7 @@ unmounted or mounted read-only, immediately followed by the reboot. If is specified - twice the the operation is immediately + twice the operation is immediately executed without terminating any processes or unmounting any file systems. This may result in data diff --git a/man/systemd.device.xml b/man/systemd.device.xml index 7c05ab035b..c360319d23 100644 --- a/man/systemd.device.xml +++ b/man/systemd.device.xml @@ -131,7 +131,7 @@ to 1 the device will be considered plugged the moment it shows up in the udev tree. This property has no - influence on the behaviour when a + influence on the behavior when a device disappears from the udev tree. This option is useful to support devices that initially show up in an diff --git a/man/systemd.exec.xml b/man/systemd.exec.xml index cf6ab1778e..7ab9b5c1ed 100644 --- a/man/systemd.exec.xml +++ b/man/systemd.exec.xml @@ -471,7 +471,7 @@ TTYVTDisallocate= - If the the terminal + If the terminal device specified with TTYPath= is a virtual console terminal try to @@ -806,7 +806,7 @@ Set a specific control group attribute for executed - processes, and (if needed) add the the + processes, and (if needed) add the executed processes to a cgroup in the hierarchy of the controller the attribute belongs to. Takes two @@ -1055,7 +1055,7 @@ UtmpIdentifier= - Takes a a four + Takes a four character identifier string for an utmp/wtmp entry for this service. This should only be set for services such diff --git a/man/systemd.service.xml b/man/systemd.service.xml index c547948c6e..339dea9aa5 100644 --- a/man/systemd.service.xml +++ b/man/systemd.service.xml @@ -160,7 +160,7 @@ complete and all communication channels set up. The child continues to run as the main daemon - process. This is the behaviour of + process. This is the behavior of traditional UNIX daemons. If this setting is used, it is recommended to also use the @@ -171,7 +171,7 @@ soon as the parent process exits. - Behaviour of + Behavior of is similar to , however it is expected that the process has to @@ -180,7 +180,7 @@ is particularly useful for this type of service. - Behaviour of + Behavior of is similar to , however it is expected that the daemon acquires a @@ -197,7 +197,7 @@ BusName= is specified. - Behaviour of + Behavior of is similar to , however it is expected that the daemon sends a @@ -216,7 +216,7 @@ not set, it will be implicitly set to . - Behaviour of + Behavior of is very similar to , however actual execution of a the service @@ -599,7 +599,7 @@ SIGTERM and SIGPIPE. Exit status definitions can either be numeric exit codes or termination signal names, and - are are separated by spaces. Example: + are separated by spaces. Example: "SuccessExitStatus=1 2 8 SIGKILL", ensures that exit codes 1, 2, 8 and the termination diff --git a/man/systemd.socket.xml b/man/systemd.socket.xml index 8a12e25cf4..6cf6c79e11 100644 --- a/man/systemd.socket.xml +++ b/man/systemd.socket.xml @@ -217,7 +217,7 @@ Specifies a file system FIFO to listen on. This expects an absolute file system path as - argument. Behaviour otherwise is very + argument. Behavior otherwise is very similar to the ListenDatagram= directive above. @@ -228,7 +228,7 @@ Specifies a special file in the file system to listen on. This expects an absolute file - system path as argument. Behaviour + system path as argument. Behavior otherwise is very similar to the ListenFIFO= directive above. Use this to open @@ -248,7 +248,7 @@ or kobject-uevent) as argument, optionally suffixed by a whitespace followed by a multicast - group integer. Behaviour otherwise is + group integer. Behavior otherwise is very similar to the ListenDatagram= directive above. @@ -259,7 +259,7 @@ Specifies a POSIX message queue name to listen on. This expects a valid message queue name - (i.e. beginning with /). Behaviour + (i.e. beginning with /). Behavior otherwise is very similar to the ListenFIFO= directive above. On Linux message diff --git a/man/systemd.unit.xml b/man/systemd.unit.xml index 00f6066717..e0aadf4cd3 100644 --- a/man/systemd.unit.xml +++ b/man/systemd.unit.xml @@ -440,7 +440,7 @@ Configures requirement dependencies, very similar in style to Requires=, however - in addition to this behaviour it also + in addition to this behavior it also declares that this unit is stopped when any of the units listed suddenly disappears. Units can suddenly, diff --git a/src/core/dbus-unit.c b/src/core/dbus-unit.c index ad817d7ee8..fdfa5ee200 100644 --- a/src/core/dbus-unit.c +++ b/src/core/dbus-unit.c @@ -682,7 +682,7 @@ void bus_unit_send_change_signal(Unit *u) { /* Send a properties changed signal. First for the * specific type, then for the generic unit. The * clients may rely on this order to get atomic - * behaviour if needed. */ + * behavior if needed. */ if (UNIT_VTABLE(u)->bus_invalidating_properties) { diff --git a/src/core/transaction.c b/src/core/transaction.c index 1f8d803aeb..4bce942012 100644 --- a/src/core/transaction.c +++ b/src/core/transaction.c @@ -392,7 +392,7 @@ static int transaction_verify_order_one(Transaction *tr, Job *j, Job *from, unsi j->marker = from ? from : j; j->generation = generation; - /* We assume that the the dependencies are bidirectional, and + /* We assume that the dependencies are bidirectional, and * hence can ignore UNIT_AFTER */ SET_FOREACH(u, j->unit->dependencies[UNIT_BEFORE], i) { Job *o; diff --git a/src/core/unit.c b/src/core/unit.c index c9cd9ee2a0..3950c43f5e 100644 --- a/src/core/unit.c +++ b/src/core/unit.c @@ -1327,7 +1327,7 @@ void unit_notify(Unit *u, UnitActiveState os, UnitActiveState ns, bool reload_su /* Note that this is called for all low-level state changes, * even if they might map to the same high-level * UnitActiveState! That means that ns == os is OK an expected - * behaviour here. For example: if a mount point is remounted + * behavior here. For example: if a mount point is remounted * this function will be called too! */ if (u->manager->n_reloading <= 0) { diff --git a/src/core/unit.h b/src/core/unit.h index 89bd61c2d8..5b4dda4cb0 100644 --- a/src/core/unit.h +++ b/src/core/unit.h @@ -285,7 +285,7 @@ struct UnitVTable { * UNIT_STUB if no configuration could be found. */ int (*load)(Unit *u); - /* If a a lot of units got created via enumerate(), this is + /* If a lot of units got created via enumerate(), this is * where to actually set the state and call unit_notify(). */ int (*coldplug)(Unit *u); diff --git a/src/journal/journal-file.c b/src/journal/journal-file.c index 8dc0a3a669..e778e1c67c 100644 --- a/src/journal/journal-file.c +++ b/src/journal/journal-file.c @@ -1051,7 +1051,7 @@ void journal_file_post_change(JournalFile *f) { __sync_synchronize(); if (ftruncate(f->fd, f->last_stat.st_size) < 0) - log_error("Failed to to truncate file to its own size: %m"); + log_error("Failed to truncate file to its own size: %m"); } int journal_file_append_entry(JournalFile *f, const dual_timestamp *ts, const struct iovec iovec[], unsigned n_iovec, uint64_t *seqnum, Object **ret, uint64_t *offset) { diff --git a/src/journal/lookup3.c b/src/journal/lookup3.c index 31eac8c543..ee9a1834cf 100644 --- a/src/journal/lookup3.c +++ b/src/journal/lookup3.c @@ -14,7 +14,7 @@ if SELF_TEST is defined. You can use this free for any purpose. It's in the public domain. It has no warranty. You probably want to use hashlittle(). hashlittle() and hashbig() -hash byte arrays. hashlittle() is is faster than hashbig() on +hash byte arrays. hashlittle() is faster than hashbig() on little-endian machines. Intel and AMD are little-endian machines. On second thought, you probably want hashlittle2(), which is identical to hashlittle() except it returns two 32-bit hashes for the price of one. diff --git a/src/journal/mmap-cache.c b/src/journal/mmap-cache.c index 2b45e375c5..7d6c6c22ba 100644 --- a/src/journal/mmap-cache.c +++ b/src/journal/mmap-cache.c @@ -392,7 +392,7 @@ static int mmap_cache_put( if (st) { /* Memory maps that are larger then the files - underneath have undefined behaviour. Hence, clamp + underneath have undefined behavior. Hence, clamp things to the file size if we know it */ if (woffset >= (uint64_t) st->st_size) diff --git a/src/libudev/libudev-device.c b/src/libudev/libudev-device.c index 1bef70962c..972ace5d39 100644 --- a/src/libudev/libudev-device.c +++ b/src/libudev/libudev-device.c @@ -1124,7 +1124,7 @@ _public_ const char *udev_device_get_sysname(struct udev_device *udev_device) * * Get the instance number of the device. * - * Returns: the trailing number string of of the device name + * Returns: the trailing number string of the device name **/ _public_ const char *udev_device_get_sysnum(struct udev_device *udev_device) { diff --git a/src/udev/udevd.c b/src/udev/udevd.c index b4fc624db3..35263ff135 100644 --- a/src/udev/udevd.c +++ b/src/udev/udevd.c @@ -1177,7 +1177,7 @@ int main(int argc, char *argv[]) } if (systemd_fds(udev, &fd_ctrl, &fd_netlink) >= 0) { - /* get control and netlink socket from from systemd */ + /* get control and netlink socket from systemd */ udev_ctrl = udev_ctrl_new_from_fd(udev, fd_ctrl); if (udev_ctrl == NULL) { log_error("error taking over udev control socket"); diff --git a/test/test-functions b/test/test-functions index c355423192..0587cd4feb 100644 --- a/test/test-functions +++ b/test/test-functions @@ -620,7 +620,7 @@ for_each_kmod_dep() { # $1 = search only in subdirectory of /kernel/$1 # $2 = function to call with module name to filter. # This function will be passed the full path to the module to test. -# The behaviour of this function can vary depending on whether $hostonly is set. +# The behavior of this function can vary depending on whether $hostonly is set. # If it is, we will only look at modules that are already in memory. # If it is not, we will look at all kernel modules # This function returns the full filenames of modules that match $1 -- cgit v1.2.3-54-g00ecf