Imported Upstream version 228

This commit is contained in:
Martin Pitt 2015-11-18 10:25:59 +01:00
parent 6300502b6b
commit db2df898cc
1049 changed files with 78086 additions and 63110 deletions

28
.gitignore vendored
View File

@ -20,12 +20,12 @@
/*.tar.bz2
/*.tar.gz
/*.tar.xz
/Makefile
/TAGS
/GPATH
/GRTAGS
/GSYMS
/GTAGS
/Makefile
/TAGS
/ata_id
/bootctl
/build-aux
@ -42,14 +42,12 @@
/journalctl
/libsystemd-*.c
/libtool
/linuxx64.efi.stub
/localectl
/loginctl
/machinectl
/mtd_probe
/networkctl
/linuxx64.efi.stub
/systemd-bootx64.efi
/test-efi-disk.img
/scsi_id
/systemadm
/systemctl
@ -61,6 +59,7 @@
/systemd-backlight
/systemd-binfmt
/systemd-bootchart
/systemd-bootx64.efi
/systemd-bus-proxyd
/systemd-cat
/systemd-cgls
@ -135,11 +134,11 @@
/systemd-vconsole-setup
/tags
/test-acd
/test-architecture
/test-audit-type
/test-af-list
/test-architecture
/test-arphrd-list
/test-async
/test-audit-type
/test-barrier
/test-bitmap
/test-boot-timestamp
@ -183,22 +182,24 @@
/test-dhcp-server
/test-dhcp6-client
/test-dns-domain
/test-efi-disk.img
/test-ellipsize
/test-engine
/test-env-replace
/test-event
/test-execute
/test-extract-word
/test-fdset
/test-fileio
/test-fstab-util
/test-firewall-util
/test-fstab-util
/test-hashmap
/test-hostname
/test-hostname-util
/test-icmp6-rs
/test-id128
/test-inhibit
/test-install
/test-install-root
/test-ipcrm
/test-ipv4ll
/test-ipv4ll-manual
@ -229,13 +230,16 @@
/test-machine-tables
/test-mmap-cache
/test-namespace
/test-ndisc-rs
/test-netlink
/test-netlink-manual
/test-network
/test-network-tables
/test-ns
/test-parse-util
/test-path
/test-path-lookup
/test-path-util
/test-pppoe
/test-prioq
/test-process-util
/test-pty
@ -244,8 +248,6 @@
/test-replace-var
/test-resolve
/test-ring
/test-netlink
/test-netlink-manual
/test-sched-prio
/test-set
/test-sigbus
@ -254,6 +256,7 @@
/test-socket-util
/test-ssd
/test-strbuf
/test-string-util
/test-strip-tab-ansi
/test-strv
/test-strxcpyx
@ -266,6 +269,7 @@
/test-unaligned
/test-unit-file
/test-unit-name
/test-user-util
/test-utf8
/test-util
/test-verbs

View File

@ -63,3 +63,4 @@ Arnd Bergmann <arnd@arndb.de>
Tom Rini <trini@kernel.crashing.org>
Paul Mundt <lethal@linux-sh.org>
Atul Sabharwal <atul.sabharwal@intel.com>
Daniel Machon <Danielmachon@live.dk>

View File

@ -145,11 +145,15 @@
- Think about the types you use. If a value cannot sensibly be
negative, do not use "int", but use "unsigned".
- Do not use types like "short". They *never* make sense. Use ints,
longs, long longs, all in unsigned+signed fashion, and the fixed
size types uint32_t and so on, as well as size_t, but nothing
else. Do not use kernel types like u32 and so on, leave that to the
kernel.
- Use "char" only for actual characters. Use "uint8_t" or "int8_t"
when you actually mean a byte-sized signed or unsigned
integers. When referring to a generic byte, we generally prefer the
unsigned variant "uint8_t". Do not use types based on "short". They
*never* make sense. Use ints, longs, long longs, all in
unsigned+signed fashion, and the fixed size types
uint8_t/uint16_t/uint32_t/uint64_t/int8_t/int16_t/int32_t and so on,
as well as size_t, but nothing else. Do not use kernel types like
u32 and so on, leave that to the kernel.
- Public API calls (i.e. functions exported by our shared libraries)
must be marked "_public_" and need to be prefixed with "sd_". No
@ -342,3 +346,33 @@
- To determine the length of a constant string "foo", don't bother
with sizeof("foo")-1, please use strlen("foo") directly. gcc knows
strlen() anyway and turns it into a constant expression if possible.
- If you want to concatenate two or more strings, consider using
strjoin() rather than asprintf(), as the latter is a lot
slower. This matters particularly in inner loops.
- Please avoid using global variables as much as you can. And if you
do use them make sure they are static at least, instead of
exported. Especially in library-like code it is important to avoid
global variables. Why are global variables bad? They usually hinder
generic reusability of code (since they break in threaded programs,
and usually would require locking there), and as the code using them
has side-effects make programs intransparent. That said, there are
many cases where they explicitly make a lot of sense, and are OK to
use. For example, the log level and target in log.c is stored in a
global variable, and that's OK and probably expected by most. Also
in many cases we cache data in global variables. If you add more
caches like this, please be careful however, and think about
threading. Only use static variables if you are sure that
thread-safety doesn't matter in your case. Alternatively consider
using TLS, which is pretty easy to use with gcc's "thread_local"
concept. It's also OK to store data that is inherently global in
global variables, for example data parsed from command lines, see
below.
- If you parse a command line, and want to store the parsed parameters
in global variables, please consider prefixing their names with
"arg_". We have been following this naming rule in most of our
tools, and we should continue to do so, as it makes it easy to
identify command line parameter variables, and makes it clear why it
is OK that they are global variables.

View File

@ -136,7 +136,6 @@ MANPAGES += \
man/systemd.scope.5 \
man/systemd.service.5 \
man/systemd.slice.5 \
man/systemd.snapshot.5 \
man/systemd.socket.5 \
man/systemd.special.7 \
man/systemd.swap.5 \
@ -374,6 +373,7 @@ MANPAGES_ALIAS += \
man/systemd-hybrid-sleep.service.8 \
man/systemd-initctl.8 \
man/systemd-initctl.socket.8 \
man/systemd-journald-audit.socket.8 \
man/systemd-journald-dev-log.socket.8 \
man/systemd-journald.8 \
man/systemd-journald.socket.8 \
@ -663,6 +663,7 @@ man/systemd-hibernate.service.8: man/systemd-suspend.service.8
man/systemd-hybrid-sleep.service.8: man/systemd-suspend.service.8
man/systemd-initctl.8: man/systemd-initctl.service.8
man/systemd-initctl.socket.8: man/systemd-initctl.service.8
man/systemd-journald-audit.socket.8: man/systemd-journald.service.8
man/systemd-journald-dev-log.socket.8: man/systemd-journald.service.8
man/systemd-journald.8: man/systemd-journald.service.8
man/systemd-journald.socket.8: man/systemd-journald.service.8
@ -1378,6 +1379,9 @@ man/systemd-initctl.html: man/systemd-initctl.service.html
man/systemd-initctl.socket.html: man/systemd-initctl.service.html
$(html-alias)
man/systemd-journald-audit.socket.html: man/systemd-journald.service.html
$(html-alias)
man/systemd-journald-dev-log.socket.html: man/systemd-journald.service.html
$(html-alias)
@ -2408,7 +2412,6 @@ EXTRA_DIST += \
man/systemd.scope.xml \
man/systemd.service.xml \
man/systemd.slice.xml \
man/systemd.snapshot.xml \
man/systemd.socket.xml \
man/systemd.special.xml \
man/systemd.swap.xml \

View File

@ -42,9 +42,9 @@ LIBUDEV_CURRENT=7
LIBUDEV_REVISION=4
LIBUDEV_AGE=6
LIBSYSTEMD_CURRENT=12
LIBSYSTEMD_CURRENT=13
LIBSYSTEMD_REVISION=0
LIBSYSTEMD_AGE=12
LIBSYSTEMD_AGE=13
# The following four libraries only exist for compatibility reasons,
# their version info should not be bumped anymore
@ -616,7 +616,8 @@ EXTRA_DIST += \
units/initrd-udevadm-cleanup-db.service.in \
units/initrd-switch-root.service.in \
units/systemd-nspawn@.service.in \
units/systemd-update-done.service.in
units/systemd-update-done.service.in \
units/tmp.mount.m4
if HAVE_SYSV_COMPAT
nodist_systemunit_DATA += \
@ -724,8 +725,8 @@ SOURCE_XML_FILES = ${patsubst %,$(top_srcdir)/%,$(filter-out man/systemd.directi
# This target should only be run manually. It recreates Makefile-man.am
# file in the source directory based on all man/*.xml files. Run it after
# adding, removing, or changing the conditional in a man page.
update-man-list: $(top_srcdir)/tools/make-man-rules.py $(XML_GLOB)
$(AM_V_GEN)$(PYTHON) $^ > $(top_srcdir)/Makefile-man.tmp
update-man-list: $(top_srcdir)/tools/make-man-rules.py $(XML_GLOB) man/custom-entities.ent
$(AM_V_GEN)$(PYTHON) $< $(XML_GLOB) > $(top_srcdir)/Makefile-man.tmp
$(AM_V_at)mv $(top_srcdir)/Makefile-man.tmp $(top_srcdir)/Makefile-man.am
@echo "Makefile-man.am has been regenerated"
@ -761,10 +762,11 @@ noinst_LTLIBRARIES += \
libbasic_la_SOURCES = \
src/basic/missing.h \
src/basic/capability.c \
src/basic/capability.h \
src/basic/capability-util.c \
src/basic/capability-util.h \
src/basic/conf-files.c \
src/basic/conf-files.h \
src/basic/stdio-util.h \
src/basic/hostname-util.h \
src/basic/hostname-util.c \
src/basic/unit-name.c \
@ -780,6 +782,42 @@ libbasic_la_SOURCES = \
src/basic/refcnt.h \
src/basic/util.c \
src/basic/util.h \
src/basic/io-util.c \
src/basic/io-util.h \
src/basic/string-util.c \
src/basic/string-util.h \
src/basic/fd-util.c \
src/basic/fd-util.h \
src/basic/parse-util.c \
src/basic/parse-util.h \
src/basic/user-util.c \
src/basic/user-util.h \
src/basic/rlimit-util.c \
src/basic/rlimit-util.h \
src/basic/dirent-util.c \
src/basic/dirent-util.h \
src/basic/xattr-util.c \
src/basic/xattr-util.h \
src/basic/chattr-util.c \
src/basic/chattr-util.h \
src/basic/proc-cmdline.c \
src/basic/proc-cmdline.h \
src/basic/fs-util.c \
src/basic/fs-util.h \
src/basic/syslog-util.c \
src/basic/syslog-util.h \
src/basic/stat-util.c \
src/basic/stat-util.h \
src/basic/mount-util.c \
src/basic/mount-util.h \
src/basic/hexdecoct.c \
src/basic/hexdecoct.h \
src/basic/glob-util.h \
src/basic/glob-util.c \
src/basic/extract-word.c \
src/basic/extract-word.h \
src/basic/escape.c \
src/basic/escape.h \
src/basic/cpu-set-util.c \
src/basic/cpu-set-util.h \
src/basic/lockfile-util.c \
@ -790,8 +828,11 @@ libbasic_la_SOURCES = \
src/basic/time-util.h \
src/basic/locale-util.c \
src/basic/locale-util.h \
src/basic/umask-util.h \
src/basic/signal-util.c \
src/basic/signal-util.h \
src/basic/string-table.c \
src/basic/string-table.h \
src/basic/mempool.c \
src/basic/mempool.h \
src/basic/hashmap.c \
@ -806,6 +847,8 @@ libbasic_la_SOURCES = \
src/basic/fdset.h \
src/basic/prioq.c \
src/basic/prioq.h \
src/basic/web-util.c \
src/basic/web-util.h \
src/basic/strv.c \
src/basic/strv.h \
src/basic/env-util.c \
@ -837,6 +880,7 @@ libbasic_la_SOURCES = \
src/basic/in-addr-util.c \
src/basic/in-addr-util.h \
src/basic/ether-addr-util.h \
src/basic/ether-addr-util.c \
src/basic/replace-var.c \
src/basic/replace-var.h \
src/basic/clock-util.c \
@ -863,8 +907,8 @@ libbasic_la_SOURCES = \
src/basic/login-util.c \
src/basic/cap-list.c \
src/basic/cap-list.h \
src/basic/audit.c \
src/basic/audit.h \
src/basic/audit-util.c \
src/basic/audit-util.h \
src/basic/xml.c \
src/basic/xml.h \
src/basic/json.c \
@ -898,7 +942,10 @@ libbasic_la_SOURCES = \
src/basic/rm-rf.c \
src/basic/rm-rf.h \
src/basic/copy.c \
src/basic/copy.h
src/basic/copy.h \
src/basic/alloc-util.h \
src/basic/alloc-util.c \
src/basic/formats-util.h
nodist_libbasic_la_SOURCES = \
src/basic/errno-from-name.h \
@ -919,7 +966,6 @@ libbasic_la_CFLAGS = \
libbasic_la_LIBADD = \
$(SELINUX_LIBS) \
$(CAP_LIBS) \
-ldl \
-lrt \
-lm
@ -939,7 +985,6 @@ libshared_la_SOURCES = \
src/shared/architecture.h \
src/shared/efivars.c \
src/shared/efivars.h \
src/shared/formats-util.h \
src/shared/fstab-util.c \
src/shared/fstab-util.h \
src/shared/sleep-config.c \
@ -1093,8 +1138,6 @@ libcore_la_SOURCES = \
src/core/bus-policy.h \
src/core/target.c \
src/core/target.h \
src/core/snapshot.c \
src/core/snapshot.h \
src/core/device.c \
src/core/device.h \
src/core/mount.c \
@ -1133,8 +1176,6 @@ libcore_la_SOURCES = \
src/core/dbus-busname.h \
src/core/dbus-target.c \
src/core/dbus-target.h \
src/core/dbus-snapshot.c \
src/core/dbus-snapshot.h \
src/core/dbus-device.c \
src/core/dbus-device.h \
src/core/dbus-mount.c \
@ -1229,7 +1270,7 @@ BUILT_SOURCES += \
$(gperf_gperf_m4_sources:-gperf.gperf.m4=-gperf-nulstr.c) \
$(gperf_gperf_sources:-gperf.gperf=-gperf.c) \
$(gperf_txt_sources:-list.txt=-from-name.h) \
$(gperf_txt_sources:-list.txt=-to-name.h)
$(filter-out %keyboard-keys-to-name.h,$(gperf_txt_sources:-list.txt=-to-name.h))
CLEANFILES += \
$(gperf_txt_sources:-list.txt=-from-name.gperf)
@ -1358,7 +1399,8 @@ nodist_rpmmacros_DATA = \
EXTRA_DIST += \
src/core/systemd.pc.in \
src/core/macros.systemd.in
src/core/macros.systemd.in \
src/core/triggers.systemd.in
# ------------------------------------------------------------------------------
@ -1402,6 +1444,10 @@ tests += \
test-utf8 \
test-ellipsize \
test-util \
test-string-util \
test-extract-word \
test-parse-util \
test-user-util \
test-hostname-util \
test-process-util \
test-terminal-util \
@ -1448,7 +1494,8 @@ tests += \
test-verbs \
test-af-list \
test-arphrd-list \
test-dns-domain
test-dns-domain \
test-install-root
EXTRA_DIST += \
test/a.service \
@ -1457,7 +1504,7 @@ EXTRA_DIST += \
test/c.service \
test/daughter.service \
test/d.service \
test/end.service.in \
test/end.service \
test/e.service \
test/f.service \
test/grandchild.service \
@ -1467,7 +1514,6 @@ EXTRA_DIST += \
test/h.service \
test/parent-deep.slice \
test/parent.slice \
test/paths.target \
test/sched_idle_bad.service \
test/sched_idle_ok.service \
test/sched_rr_bad.service \
@ -1481,43 +1527,62 @@ EXTRA_DIST += \
test/testsuite.target \
test/timers.target \
test/unstoppable.service \
test/path-changed.service \
test/path-directorynotempty.service \
test/path-existsglob.service \
test/path-exists.service \
test/path-makedirectory.service \
test/path-modified.service \
test/path-mycustomunit.service \
test/path-service.service \
test/path-changed.path \
test/path-directorynotempty.path \
test/path-existsglob.path \
test/path-exists.path \
test/path-makedirectory.path \
test/path-modified.path \
test/path-unit.path \
test/exec-environment-empty.service \
test/exec-environment-multiple.service \
test/exec-environment.service \
test/exec-group.service \
test/exec-ignoresigpipe-no.service \
test/exec-ignoresigpipe-yes.service \
test/exec-personality-x86-64.service \
test/exec-personality-x86.service \
test/exec-personality-s390.service \
test/exec-privatedevices-no.service \
test/exec-privatedevices-yes.service \
test/exec-privatetmp-no.service \
test/exec-privatetmp-yes.service \
test/exec-systemcallerrornumber.service \
test/exec-systemcallfilter-failing2.service \
test/exec-systemcallfilter-failing.service \
test/exec-systemcallfilter-not-failing2.service \
test/exec-systemcallfilter-not-failing.service \
test/exec-user.service \
test/exec-workingdirectory.service \
test/exec-umask-0177.service \
test/exec-umask-default.service \
test/test-path/paths.target \
test/test-path/basic.target \
test/test-path/sysinit.target \
test/test-path/path-changed.service \
test/test-path/path-directorynotempty.service \
test/test-path/path-existsglob.service \
test/test-path/path-exists.service \
test/test-path/path-makedirectory.service \
test/test-path/path-modified.service \
test/test-path/path-mycustomunit.service \
test/test-path/path-service.service \
test/test-path/path-changed.path \
test/test-path/path-directorynotempty.path \
test/test-path/path-existsglob.path \
test/test-path/path-exists.path \
test/test-path/path-makedirectory.path \
test/test-path/path-modified.path \
test/test-path/path-unit.path \
test/test-execute/exec-environment-empty.service \
test/test-execute/exec-environment-multiple.service \
test/test-execute/exec-environment.service \
test/test-execute/exec-passenvironment-absent.service \
test/test-execute/exec-passenvironment-empty.service \
test/test-execute/exec-passenvironment-repeated.service \
test/test-execute/exec-passenvironment.service \
test/test-execute/exec-group.service \
test/test-execute/exec-ignoresigpipe-no.service \
test/test-execute/exec-ignoresigpipe-yes.service \
test/test-execute/exec-personality-x86-64.service \
test/test-execute/exec-personality-x86.service \
test/test-execute/exec-personality-s390.service \
test/test-execute/exec-privatedevices-no.service \
test/test-execute/exec-privatedevices-yes.service \
test/test-execute/exec-privatetmp-no.service \
test/test-execute/exec-privatetmp-yes.service \
test/test-execute/exec-systemcallerrornumber.service \
test/test-execute/exec-systemcallfilter-failing2.service \
test/test-execute/exec-systemcallfilter-failing.service \
test/test-execute/exec-systemcallfilter-not-failing2.service \
test/test-execute/exec-systemcallfilter-not-failing.service \
test/test-execute/exec-user.service \
test/test-execute/exec-workingdirectory.service \
test/test-execute/exec-umask-0177.service \
test/test-execute/exec-umask-default.service \
test/test-execute/exec-privatenetwork-yes.service \
test/test-execute/exec-environmentfile.service \
test/test-execute/exec-oomscoreadjust-positive.service \
test/test-execute/exec-oomscoreadjust-negative.service \
test/test-execute/exec-ioschedulingclass-best-effort.service \
test/test-execute/exec-ioschedulingclass-idle.service \
test/test-execute/exec-ioschedulingclass-none.service \
test/test-execute/exec-ioschedulingclass-realtime.service \
test/test-execute/exec-capabilityboundingset-invert.service \
test/test-execute/exec-capabilityboundingset-merge.service \
test/test-execute/exec-capabilityboundingset-reset.service \
test/test-execute/exec-capabilityboundingset-simple.service \
test/bus-policy/hello.conf \
test/bus-policy/methods.conf \
test/bus-policy/ownerships.conf \
@ -1686,6 +1751,30 @@ test_util_SOURCES = \
test_util_LDADD = \
libshared.la
test_string_util_SOURCES = \
src/test/test-string-util.c
test_string_util_LDADD = \
libshared.la
test_extract_word_SOURCES = \
src/test/test-extract-word.c
test_extract_word_LDADD = \
libshared.la
test_parse_util_SOURCES = \
src/test/test-parse-util.c
test_parse_util_LDADD = \
libshared.la
test_user_util_SOURCES = \
src/test/test-user-util.c
test_user_util_LDADD = \
libshared.la
test_hostname_util_SOURCES = \
src/test/test-hostname-util.c
@ -1749,6 +1838,12 @@ test_verbs_SOURCES = \
test_verbs_LDADD = \
libshared.la
test_install_root_SOURCES = \
src/test/test-install-root.c
test_install_root_LDADD = \
libshared.la
test_namespace_LDADD = \
libcore.la
@ -3215,10 +3310,9 @@ libsystemd_network_la_SOURCES = \
src/systemd/sd-dhcp-lease.h \
src/systemd/sd-ipv4ll.h \
src/systemd/sd-ipv4acd.h \
src/systemd/sd-icmp6-nd.h \
src/systemd/sd-ndisc.h \
src/systemd/sd-dhcp6-client.h \
src/systemd/sd-dhcp6-lease.h \
src/systemd/sd-pppoe.h \
src/systemd/sd-lldp.h \
src/libsystemd-network/sd-dhcp-client.c \
src/libsystemd-network/sd-dhcp-server.c \
@ -3234,10 +3328,11 @@ libsystemd_network_la_SOURCES = \
src/libsystemd-network/sd-ipv4acd.c \
src/libsystemd-network/arp-util.h \
src/libsystemd-network/arp-util.c \
src/libsystemd-network/sd-pppoe.c \
src/libsystemd-network/network-internal.c \
src/libsystemd-network/network-internal.h \
src/libsystemd-network/sd-icmp6-nd.c \
src/libsystemd-network/sd-ndisc.c \
src/libsystemd-network/icmp6-util.h \
src/libsystemd-network/icmp6-util.c \
src/libsystemd-network/sd-dhcp6-client.c \
src/libsystemd-network/dhcp6-internal.h \
src/libsystemd-network/dhcp6-protocol.h \
@ -3313,23 +3408,15 @@ test_acd_LDADD = \
libsystemd-network.la \
libshared.la
test_pppoe_SOURCES = \
src/systemd/sd-pppoe.h \
src/libsystemd-network/test-pppoe.c
test_pppoe_LDADD = \
libsystemd-network.la \
libshared.la
test_icmp6_rs_SOURCES = \
test_ndisc_rs_SOURCES = \
src/systemd/sd-dhcp6-client.h \
src/systemd/sd-icmp6-nd.h \
src/libsystemd-network/dhcp6-internal.h \
src/libsystemd-network/test-icmp6-rs.c \
src/systemd/sd-ndisc.h \
src/libsystemd-network/icmp6-util.h \
src/libsystemd-network/test-ndisc-rs.c \
src/libsystemd-network/dhcp-identifier.h \
src/libsystemd-network/dhcp-identifier.c
test_icmp6_rs_LDADD = \
test_ndisc_rs_LDADD = \
libsystemd-network.la \
libudev.la \
libshared.la
@ -3361,13 +3448,10 @@ tests += \
test-dhcp-client \
test-dhcp-server \
test-ipv4ll \
test-icmp6-rs \
test-ndisc-rs \
test-dhcp6-client \
test-lldp
manual_tests += \
test-pppoe
# ------------------------------------------------------------------------------
include_HEADERS += \
src/libudev/libudev.h
@ -3483,7 +3567,7 @@ noinst_LTLIBRARIES += \
src/udev/keyboard-keys-list.txt:
$(AM_V_at)$(MKDIR_P) $(dir $@)
$(AM_V_GEN)$(CPP) $(CFLAGS) $(AM_CPPFLAGS) $(CPPFLAGS) -dM -include linux/input.h - < /dev/null | $(AWK) '/^#define[ \t]+KEY_[^ ]+[ \t]+[0-9]/ { if ($$2 != "KEY_MAX") { print $$2 } }' | sed 's/^KEY_COFFEE$$/KEY_SCREENLOCK/' > $@
$(AM_V_GEN)$(CPP) $(CFLAGS) $(AM_CPPFLAGS) $(CPPFLAGS) -dM -include linux/input.h - < /dev/null | $(AWK) '/^#define[ \t]+KEY_[^ ]+[ \t]+[0-9K]/ { if ($$2 != "KEY_MAX") { print $$2 } }' > $@
src/udev/keyboard-keys-from-name.gperf: src/udev/keyboard-keys-list.txt
$(AM_V_GEN)$(AWK) 'BEGIN{ print "struct key { const char* name; unsigned short id; };"; print "%null-strings"; print "%%";} { print tolower(substr($$1 ,5)) ", " $$1 }' < $< > $@
@ -3491,9 +3575,6 @@ src/udev/keyboard-keys-from-name.gperf: src/udev/keyboard-keys-list.txt
src/udev/keyboard-keys-from-name.h: src/udev/keyboard-keys-from-name.gperf
$(AM_V_GPERF)$(GPERF) -L ANSI-C -t -N keyboard_lookup_key -H hash_key_name -p -C < $< > $@
src/udev/keyboard-keys-to-name.h: src/udev/keyboard-keys-list.txt
$(AM_V_GEN)$(AWK) 'BEGIN{ print "const char* const key_names[KEY_CNT] = { "} { print "[" $$1 "] = \"" $$1 "\"," } END{print "};"}' < $< > $@
gperf_txt_sources += \
src/udev/keyboard-keys-list.txt
@ -3520,7 +3601,6 @@ libudev_core_la_SOURCES = \
nodist_libudev_core_la_SOURCES = \
src/udev/keyboard-keys-from-name.h \
src/udev/keyboard-keys-to-name.h \
src/udev/net/link-config-gperf.c
gperf_gperf_sources += \
@ -3831,6 +3911,7 @@ endif
if HAVE_GNUTLS
systemd_journal_remote_LDADD += \
$(GNUTLS_LIBS)
endif
# systemd-journal-remote make sense mostly with full crypto stack
dist_systemunit_DATA += \
@ -3845,7 +3926,6 @@ journal-remote-install-hook: journal-install-hook
-chmod 755 $(DESTDIR)/var/log/journal/remote
INSTALL_EXEC_HOOKS += journal-remote-install-hook
endif
nodist_pkgsysconf_DATA += \
src/journal-remote/journal-remote.conf
@ -4184,6 +4264,7 @@ dist_catalog_DATA = \
catalog/systemd.pl.catalog \
catalog/systemd.pt_BR.catalog \
catalog/systemd.ru.catalog \
catalog/systemd.zh_CN.catalog \
catalog/systemd.zh_TW.catalog \
catalog/systemd.catalog
@ -5148,7 +5229,8 @@ libnss_resolve_la_LDFLAGS = \
-Wl,--version-script=$(top_srcdir)/src/nss-resolve/nss-resolve.sym
libnss_resolve_la_LIBADD = \
libshared.la
libshared.la \
-ldl
lib_LTLIBRARIES += \
libnss_resolve.la
@ -5234,6 +5316,7 @@ libnetworkd_core_la_SOURCES = \
src/network/networkd-ipv4ll.c \
src/network/networkd-dhcp4.c \
src/network/networkd-dhcp6.c \
src/network/networkd-ndisc.c \
src/network/networkd-network.h \
src/network/networkd-network.c \
src/network/networkd-network-bus.c \
@ -5798,7 +5881,7 @@ sysctl.d/%: sysctl.d/%.in
%.conf: %.conf.in
$(SED_PROCESS)
src/core/macros.%: src/core/macros.%.in
src/core/%.systemd: src/core/%.systemd.in
$(SED_PROCESS)
src/%.policy.in: src/%.policy.in.in
@ -6107,9 +6190,9 @@ hwdb-update:
( cd $(top_srcdir)/hwdb && \
wget -O usb.ids 'http://www.linux-usb.org/usb.ids' && \
wget -O pci.ids 'http://pci-ids.ucw.cz/v2.2/pci.ids' && \
wget -O ma-large.txt 'https://services13.ieee.org/RST/standards-ra-web/rest/assignments/download/?registry=MA-L&format=txt' && \
wget -O ma-medium.txt 'https://services13.ieee.org/RST/standards-ra-web/rest/assignments/download/?registry=MA-M&format=txt' && \
wget -O ma-small.txt 'https://services13.ieee.org/RST/standards-ra-web/rest/assignments/download/?registry=MA-S&format=txt' && \
wget -O ma-large.txt 'http://standards.ieee.org/develop/regauth/oui/oui.txt' && \
wget -O ma-medium.txt 'http://standards.ieee.org/develop/regauth/oui28/mam.txt' && \
wget -O ma-small.txt 'http://standards.ieee.org/develop/regauth/oui36/oui36.txt' && \
./ids-update.pl )
.PHONY: built-sources

230
NEWS
View File

@ -1,5 +1,195 @@
systemd System and Service Manager
CHANGES WITH 228:
* A number of properties previously only settable in unit
files are now also available as properties to set when
creating transient units programmatically via the bus, as it
is exposed with systemd-run's --property=
setting. Specifically, these are: SyslogIdentifier=,
SyslogLevelPrefix=, TimerSlackNSec=, OOMScoreAdjust=,
EnvironmentFile=, ReadWriteDirectories=,
ReadOnlyDirectories=, InaccessibleDirectories=,
ProtectSystem=, ProtectHome=, RuntimeDirectory=.
* When creating transient services via the bus API it is now
possible to pass in a set of file descriptors to use as
STDIN/STDOUT/STDERR for the invoked process.
* Slice units may now be created transiently via the bus APIs,
similar to the way service and scope units may already be
created transiently.
* Wherever systemd expects a calendar timestamp specification
(like in journalctl's --since= and --until= switches) UTC
timestamps are now supported. Timestamps suffixed with "UTC"
are now considered to be in Universal Time Coordinated
instead of the local timezone. Also, timestamps may now
optionally be specified with sub-second accuracy. Both of
these additions also apply to recurring calendar event
specification, such as OnCalendar= in timer units.
* journalctl gained a new "--sync" switch that asks the
journal daemon to write all so far unwritten log messages to
disk and sync the files, before returning.
* systemd-tmpfiles learned two new line types "q" and "Q" that
operate like "v", but also set up a basic btrfs quota
hierarchy when used on a btrfs file system with quota
enabled.
* tmpfiles' "v", "q" and "Q" will now create a plain directory
instead of a subvolume (even on a btrfs file system) if the
root directory is a plain directory, and not a
subvolume. This should simplify things with certain chroot()
environments which are not aware of the concept of btrfs
subvolumes.
* systemd-detect-virt gained a new --chroot switch to detect
whether execution takes place in a chroot() environment.
* CPUAffinity= now takes CPU index ranges in addition to
individual indexes.
* The various memory-related resource limit settings (such as
LimitAS=) now understand the usual K, M, G, ... suffixes to
the base of 1024 (IEC). Similar, the time-related resource
limit settings understand the usual min, h, day, ...
suffixes now.
* There's a new system.conf setting DefaultTasksMax= to
control the default TasksMax= setting for services and
scopes running on the system. (TasksMax= is the primary
setting that exposes the "pids" cgroup controller on systemd
and was introduced in the previous systemd release.) The
setting now defaults to 512, which means services that are
not explicitly configured otherwise will only be able to
create 512 processes or threads at maximum, from this
version on. Note that this means that thread- or
process-heavy services might need to be reconfigured to set
TasksMax= to a higher value. It is sufficient to set
TasksMax= in these specific unit files to a higher value, or
even "infinity". Similar, there's now a logind.conf setting
UserTasksMax= that defaults to 4096 and limits the total
number of processes or tasks each user may own
concurrently. nspawn containers also have the TasksMax=
value set by default now, to 8192. Note that all of this
only has an effect if the "pids" cgroup controller is
enabled in the kernel. The general benefit of these changes
should be a more robust and safer system, that provides a
certain amount of per-service fork() bomb protection.
* systemd-nspawn gained the new --network-veth-extra= switch
to define additional and arbitrarily-named virtual Ethernet
links between the host and the container.
* A new service execution setting PassEnvironment= has been
added that allows importing select environment variables
from PID1's environment block into the environment block of
the service.
* systemd will now bump the net.unix.max_dgram_qlen to 512 by
default now (the kernel default is 16). This is beneficial
for avoiding blocking on AF_UNIX/SOCK_DGRAM sockets since it
allows substantially larger numbers of queued
datagrams. This should increase the capability of systemd to
parallelize boot-up, as logging and sd_notify() are unlikely
to stall execution anymore. If you need to change the value
from the new defaults, use the usual sysctl.d/ snippets.
* The compression framing format used by the journal or
coredump processing has changed to be in line with what the
official LZ4 tools generate. LZ4 compression support in
systemd was considered unsupported previously, as the format
was not compatible with the normal tools. With this release
this has changed now, and it is hence safe for downstream
distributions to turn it on. While not compressing as well
as the XZ, LZ4 is substantially faster, which makes
it a good default choice for the compression logic in the
journal and in coredump handling.
* Any reference to /etc/mtab has been dropped from
systemd. The file has been obsolete since a while, but
systemd refused to work on systems where it was incorrectly
set up (it should be a symlink or non-existent). Please make
sure to update to util-linux 2.27.1 or newer in conjunction
with this systemd release, which also drops any reference to
/etc/mtab. If you maintain a distribution make sure that no
software you package still references it, as this is a
likely source of bugs. There's also a glibc bug pending,
asking for removal of any reference to this obsolete file:
https://sourceware.org/bugzilla/show_bug.cgi?id=19108
* Support for the ".snapshot" unit type has been removed. This
feature turned out to be little useful and little used, and
has now been removed from the core and from systemctl.
* The dependency types RequiresOverridable= and
RequisiteOverridable= have been removed from systemd. They
have been used only very sparingly to our knowledge and
other options that provide a similar effect (such as
systemctl --mode=ignore-dependencies) are much more useful
and commonly used. Moreover, they were only half-way
implemented as the option to control behaviour regarding
these dependencies was never added to systemctl. By removing
these dependency types the execution engine becomes a bit
simpler. Unit files that use these dependencies should be
changed to use the non-Overridable dependency types
instead. In fact, when parsing unit files with these
options, that's what systemd will automatically convert them
too, but it will also warn, asking users to fix the unit
files accordingly. Removal of these dependency types should
only affect a negligible number of unit files in the wild.
* Behaviour of networkd's IPForward= option changed
(again). It will no longer maintain a per-interface setting,
but propagate one way from interfaces where this is enabled
to the global kernel setting. The global setting will be
enabled when requested by a network that is set up, but
never be disabled again. This change was made to make sure
IPv4 and IPv6 behaviour regarding packet forwarding is
similar (as the Linux IPv6 stack does not support
per-interface control of this setting) and to minimize
surprises.
* In unit files the behaviour of %u, %U, %h, %s has
changed. These specifiers will now unconditionally resolve
to the various user database fields of the user that the
systemd instance is running as, instead of the user
configured in the specific unit via User=. Note that this
effectively doesn't change much, as resolving of these
specifiers was already turned off in the --system instance
of systemd, as we cannot do NSS lookups from PID 1. In the
--user instance of systemd these specifiers where correctly
resolved, but hardly made any sense, since the user instance
lacks privileges to do user switches anyway, and User= is
hence useless. Morever, even in the --user instance of
systemd behaviour was awkward as it would only take settings
from User= assignment placed before the specifier into
account. In order to unify and simplify the logic around
this the specifiers will now always resolve to the
credentials of the user invoking the manager (which in case
of PID 1 is the root user).
Contributions from: Andrew Jones, Beniamino Galvani, Boyuan
Yang, Daniel Machon, Daniel Mack, David Herrmann, David
Reynolds, David Strauss, Dongsu Park, Evgeny Vereshchagin,
Felipe Sateler, Filipe Brandenburger, Franck Bui, Hristo
Venev, Iago López Galeiras, Jan Engelhardt, Jan Janssen, Jan
Synacek, Jesus Ornelas Aguayo, Karel Zak, kayrus, Kay Sievers,
Lennart Poettering, Liu Yuan Yuan, Mantas Mikulėnas, Marcel
Holtmann, Marcin Bachry, Marcos Alano, Marcos Mello, Mark
Theunissen, Martin Pitt, Michael Marineau, Michael Olbrich,
Michal Schmidt, Michal Sekletar, Mirco Tischler, Nick Owens,
Nicolas Cornu, Patrik Flykt, Peter Hutterer, reverendhomer,
Ronny Chevalier, Sangjung Woo, Seong-ho Cho, Shawn Landden,
Susant Sahani, Thomas Haller, Thomas Hindoe Paaboel Andersen,
Tom Gundersen, Torstein Husebø, Vito Caputo, Zbigniew
Jędrzejewski-Szmek
-- Berlin, 2015-11-18
CHANGES WITH 227:
* systemd now depends on util-linux v2.27. More specifically,
@ -117,7 +307,7 @@ CHANGES WITH 227:
* File descriptors passed during socket activation may now be
named. A new API sd_listen_fds_with_names() is added to
access the names. The default names may be overriden,
access the names. The default names may be overridden,
either in the .socket file using the FileDescriptorName=
parameter, or by passing FDNAME= when storing the file
descriptors using sd_notify().
@ -1156,7 +1346,7 @@ CHANGES WITH 218:
another unit listed in its Also= setting might be.
* Similar to the various existing ConditionXYZ= settings for
units there are now matching AssertXYZ= settings. While
units, there are now matching AssertXYZ= settings. While
failing conditions cause a unit to be skipped, but its job
to succeed, failing assertions declared like this will cause
a unit start operation and its job to fail.
@ -1164,7 +1354,7 @@ CHANGES WITH 218:
* hostnamed now knows a new chassis type "embedded".
* systemctl gained a new "edit" command. When used on a unit
file this allows extending unit files with .d/ drop-in
file, this allows extending unit files with .d/ drop-in
configuration snippets or editing the full file (after
copying it from /usr/lib to /etc). This will invoke the
user's editor (as configured with $EDITOR), and reload the
@ -1188,7 +1378,7 @@ CHANGES WITH 218:
inhibitors.
* Scope and service units gained a new "Delegate" boolean
property, which when set allows processes running inside the
property, which, when set, allows processes running inside the
unit to further partition resources. This is primarily
useful for systemd user instances as well as container
managers.
@ -1198,7 +1388,7 @@ CHANGES WITH 218:
audit fields are split up and fully indexed. This means that
journalctl in many ways is now a (nicer!) alternative to
ausearch, the traditional audit client. Note that this
implements only a minimal audit client, if you want the
implements only a minimal audit client. If you want the
special audit modes like reboot-on-log-overflow, please use
the traditional auditd instead, which can be used in
parallel to journald.
@ -1209,7 +1399,7 @@ CHANGES WITH 218:
* journalctl gained two new commands --vacuum-size= and
--vacuum-time= to delete old journal files until the
remaining ones take up no more the specified size on disk,
remaining ones take up no more than the specified size on disk,
or are not older than the specified time.
* A new, native PPPoE library has been added to sd-network,
@ -1262,9 +1452,9 @@ CHANGES WITH 218:
will spew out warnings if the compilation fails. This
requires libxkbcommon to be installed.
* When a coredump is collected a larger number of metadata
* When a coredump is collected, a larger number of metadata
fields is now collected and included in the journal records
created for it. More specifically control group membership,
created for it. More specifically, control group membership,
environment variables, memory maps, working directory,
chroot directory, /proc/$PID/status, and a list of open file
descriptors is now stored in the log entry.
@ -1303,7 +1493,7 @@ CHANGES WITH 218:
a fixed machine ID for subsequent boots.
* networkd's .netdev files now provide a large set of
configuration parameters for VXLAN devices. Similar, the
configuration parameters for VXLAN devices. Similarly, the
bridge port cost parameter is now configurable in .network
files. There's also new support for configuring IP source
routing. networkd .link files gained support for a new
@ -1636,7 +1826,7 @@ CHANGES WITH 216:
* .socket units gained a new DeferAcceptSec= setting that
controls the kernels' TCP_DEFER_ACCEPT sockopt for
TCP. Similar, support for controlling TCP keep-alive
TCP. Similarly, support for controlling TCP keep-alive
settings has been added (KeepAliveTimeSec=,
KeepAliveIntervalSec=, KeepAliveProbes=). Also, support for
turning off Nagle's algorithm on TCP has been added
@ -1852,7 +2042,7 @@ CHANGES WITH 215:
* tmpfiles learnt a new "L+" directive which creates a symlink
but (unlike "L") deletes a pre-existing file first, should
it already exist and not already be the correct
symlink. Similar, "b+", "c+" and "p+" directives have been
symlink. Similarly, "b+", "c+" and "p+" directives have been
added as well, which create block and character devices, as
well as fifos in the filesystem, possibly removing any
pre-existing files of different types.
@ -1934,8 +2124,8 @@ CHANGES WITH 215:
open_by_handle_at() is now prohibited for containers,
closing a hole similar to a recently discussed vulnerability
in docker regarding access to files on file hierarchies the
container should normally not have access to. Note that for
nspawn we generally make no security claims anyway (and
container should normally not have access to. Note that, for
nspawn, we generally make no security claims anyway (and
this is explicitly documented in the man page), so this is
just a fix for one of the most obvious problems.
@ -2035,14 +2225,14 @@ CHANGES WITH 214:
CAP_NET_BROADCAST, CAP_NET_RAW capabilities though, but
loses the ability to write to files owned by root this way.
* Similar, systemd-resolved now runs under its own
* Similarly, systemd-resolved now runs under its own
"systemd-resolve" user with no capabilities remaining.
* Similar, systemd-bus-proxyd now runs under its own
* Similarly, systemd-bus-proxyd now runs under its own
"systemd-bus-proxy" user with only CAP_IPC_OWNER remaining.
* systemd-networkd gained support for setting up "veth"
virtual ethernet devices for container connectivity, as well
virtual Ethernet devices for container connectivity, as well
as GRE and VTI tunnels.
* systemd-networkd will no longer automatically attempt to
@ -2744,7 +2934,7 @@ CHANGES WITH 209:
* The configuration of network interface naming rules for
"permanent interface names" has changed: a new NamePolicy=
setting in the [Link] section of .link files determines the
priority of possible naming schemes (onboard, slot, mac,
priority of possible naming schemes (onboard, slot, MAC,
path). The default value of this setting is determined by
/usr/lib/net/links/99-default.link. Old
80-net-name-slot.rules udev configuration file has been
@ -4274,8 +4464,8 @@ CHANGES WITH 197:
devices as seat masters, i.e. as devices that are required
to be existing before a seat is considered preset. Instead,
it will now look for all devices that are tagged as
"seat-master" in udev. By default framebuffer devices will
be marked as such, but depending on local systems other
"seat-master" in udev. By default, framebuffer devices will
be marked as such, but depending on local systems, other
devices might be marked as well. This may be used to
integrate graphics cards using closed source drivers (such
as NVidia ones) more nicely into logind. Note however, that
@ -5315,7 +5505,7 @@ CHANGES WITH 44:
* Reorder configuration file lookup order. /etc now always
overrides /run in order to allow the administrator to always
and unconditionally override vendor supplied or
and unconditionally override vendor-supplied or
automatically generated data.
* The various user visible bits of the journal now have man

4
README
View File

@ -122,7 +122,7 @@ REQUIREMENTS:
glibc >= 2.16
libcap
libmount >= 2.27 (from util-linux)
libmount >= 2.27.1 (from util-linux)
libseccomp >= 1.0.0 (optional)
libblkid >= 2.24 (from util-linux) (optional)
libkmod >= 15 (optional)
@ -144,7 +144,7 @@ REQUIREMENTS:
During runtime, you need the following additional
dependencies:
util-linux >= v2.27 required
util-linux >= v2.27.1 required
dbus >= 1.4.0 (strictly speaking optional, but recommended)
dracut (optional)
PolicyKit (optional)

465
TODO
View File

@ -21,14 +21,32 @@ External:
* wiki: update journal format documentation for lz4 additions
* When lz4 gets an API for lz4 command output, make use of it to
compress coredumps in a way compatible with /usr/bin/lz4.
Janitorial Clean-ups:
* code cleanup: retire FOREACH_WORD_QUOTED, port to extract_first_word() loops instead
* replace manual readdir() loops with FOREACH_DIRENT or FOREACH_DIRENT_ALL
* Get rid of the last strerror() invocations in favour of %m and strerror_r()
* Rearrange tests so that the various test-xyz.c match a specific src/basic/xyz.c again
Features:
* add a concept of RemainAfterExit= to scope units
* PID1: find a way how we can reload unit file configuration for
specific units only, without reloading the whole of systemd
* add journal vacuum by max number of files
* add an explicit parser for LimitNICE= and LimitRTPRIO= that verifies
the specified range and generates sane error messages for incorrect
specifications. Also, for LimitNICE= maybe introduce a syntax such
as "+5" or "-7" in order to make the limits more readable as they
are otherwise shifted by 20.
* do something about "/control" subcgroups in the unified cgroup hierarchy
* when we detect that there are waiting jobs but no running jobs, do something
* push CPUAffinity= also into the "cpuset" cgroup controller (only after the cpuset controller got ported to the unified hierarchy)
* add a new command "systemctl revert" or so, that removes all dropin
snippets in /run and /etc, and all unit files with counterparts in
@ -36,14 +54,8 @@ Features:
edit" create. Maybe even add "systemctl revert -a" to do this for
all units.
* sd-event: maybe add support for inotify events
* PID 1 should send out sd_notify("WATCHDOG=1") messages (for usage in the --user mode, and when run via nspawn)
* nspawn should send out sd_notify("WATCHDOG=1") messages
* nspawn should optionally support receiving WATCHDOG=1 messages from its payload PID 1...
* consider throwing a warning if a service declares it wants to be "Before=" a .device unit.
* "systemctl edit" should know a mode to create a new unit file
@ -53,69 +65,17 @@ Features:
prefixed with /sys generally special.
http://lists.freedesktop.org/archives/systemd-devel/2015-June/032962.html
* Add PassEnvironment= setting to service units, to import select env vars from PID 1 into the service env block
* nspawn: fix logic always print a final newline on output.
https://github.com/systemd/systemd/pull/272#issuecomment-113153176
* make nspawn's --network-veth switch more powerful:
http://lists.freedesktop.org/archives/systemd-devel/2015-June/033121.html
* man: document that unless you use StandardError=null the shell >/dev/stderr won't work in shell scripts in services
* man: clarify that "machinectl show" shows different information than "machinectl status" (no cgroup tree, no IP addresses, ...)
* "systemctl daemon-reload" should result in /etc/systemd/system.conf being reloaded by systemd
* install: include generator dirs in unit file search paths
* logind: follow PropertiesChanged state more closely, to deal with quick logouts and relogins
* invent a better systemd-run scheme for naming scopes, that works with remoting
* add journalctl -H that talks via ssh to a remote peer and passes through binary logs data
* change journalctl -M to acquire fd to journal directory via machined, and then operate on that via openat() instead of absolute paths
* add a version of --merge which also merges /var/log/journal/remote
* log accumulated resource usage after each service invocation
* nspawn: a nice way to boot up without machine id set, so that it is set at boot automatically for supporting --ephemeral. Maybe hash the host machine id together with the machine name to generate the machine id for the container
* logind: rename session scope so that it includes the UID. THat way
the session scope can be arranged freely in slices and we don't have
make assumptions about their slice anymore.
* journalctl: -m should access container journals directly by enumerating them via machined, and also watch containers coming and going. Benefit: nspawn --ephemeral would start working nicely with the journal.
* nspawn: don't copy /etc/resolv.conf from host into container unless we are in shared-network mode
* nspawn: optionally automatically add FORWARD rules to iptables whenever nspawn is running, remove them when shut down.
* importd: generate a nice warning if mkfs.btrfs is missing
* nspawn: add a logic for cleaning up read-only, hidden container images in /var/lib/machines that are not ancestors of any non-hidden containers
* nspawn: Improve error message when --bind= is used on a non-existing source directory
* nspawn: maybe make copying of /etc/resolv.conf optional, and skip it if --read-only is used
* man: document how update dkr images works with machinectl
http://lists.freedesktop.org/archives/systemd-devel/2015-February/028630.html
* nspawn: as soon as networkd has a bus interface, hook up --network-interface=, --network-bridge= with networkd, to trigger netdev creation should an interface be missing
* rework C11 utf8.[ch] to use char32_t instead of uint32_t when referring
to unicode chars, to make things more expressive.
* "machinectl migrate" or similar to copy a container from or to a
difference host, via ssh
* tmpfiles: creating new directories/subvolumes/fifos/device nodes
should not follow symlinks. None of the other adjustment or creation
calls follow symlinks.
* fstab-generator: default to tmpfs-as-root if only usr= is specified on the kernel cmdline
* docs: bring http://www.freedesktop.org/wiki/Software/systemd/MyServiceCantGetRealtime up to date
@ -132,95 +92,21 @@ Features:
* Maybe add support for the equivalent of "ethtool advertise" to .link files?
http://lists.freedesktop.org/archives/systemd-devel/2015-April/030112.html
* .timer units should optionally support CLOCK_BOOTTIME in addition to CLOCK_MONOTONIC
* create a btrfs qgroup for /var/lib/machines, and add all container
subvolumes we create to it.
* When logging about multiple units (stopping BoundTo units, conflicts, etc.),
log both units as UNIT=, so that journalctl -u triggers on both.
* to allow "linking" of nspawn containers, extend --network-bridge= so
that it can dynamically create bridge interfaces that are refcounted
by the containers on them. For each group of containers to link together
* journalctl --verify: don't show files that are currently being
written to as FAIL, but instead show that their are being written
to.
* assign MESSAGE_ID to log messages about failed services
* coredump: make the handler check /proc/$PID/rlimits for RLIMIT_CORE,
and supress coredump if turned off. Then change RLIMIT_CORE to
infinity by default for all services. This then allows per-service
control of coredumping.
* generate better errors when people try to set transient properties
that are not supported...
http://lists.freedesktop.org/archives/systemd-devel/2015-February/028076.html
* Introduce $LISTEN_NAMES to complement $LISTEN_FDS, containing a
colon separated list of identifiers for the fds passed.
* maybe introduce WantsMountsFor=? Usecase:
http://lists.freedesktop.org/archives/systemd-devel/2015-January/027729.html
* rework kexec logic to use new kexec_file_load() syscall, so that we
don't have to call kexec tool anymore.
* The udev blkid built-in should expose a property that reflects
whether media was sensed in USB CF/SD card readers. This should then
be used to control SYSTEMD_READY=1/0 so that USB card readers aren't
picked up by systemd unless they contain a medium. This would mirror
the behaviour we already have for CD drives.
* nspawn: emulate /dev/kmsg using CUSE and turn off the syslog syscall
with seccomp. That should provide us with a useful log buffer that
systemd can log to during early boot, and disconnect container logs
from the kernel's logs.
* networkd/udev: implement SR_IOV configuration in .link files:
http://lists.freedesktop.org/archives/systemd-devel/2015-January/027451.html
* When RLIMIT_NPROC is set from a unit file it currently always is set
for root, not for the user set in User=, which makes it
useless. After fixing this, set RLIMIT_NPROC for
systemd-journal-xyz, and all other of our services that run under
their own user ids, and use User= (but only in a world where userns
is ubiquitous since otherwise we cannot invoke those daemons on the
host AND in a container anymore). Also, if LimitNPROC= is used
without User= we should warn and refuse operation.
* logind: maybe allow configuration of the StopTimeout for session scopes
* Set NoNewPrivileges= on all of our own services, where that makes sense
* Rework systemctl's GetAll property parsing to use the generic bus_map_all_properties() API
* rework journald sigbus stuff to use mutex
* import-dkr: support tarsum checksum verification, if it becomes reality one day...
* import-dkr: convert json bits to nspawn configuration
* core/cgroup: support net_cls modules, and support automatically allocating class ids, then add support for making firewall changes depending on it, to implement a per-service firewall
* introduce systemd-nspawn-ephemeral@.service, and hook it into "machinectl start" with a new --ephemeral switch
* "machinectl status" should also show internal logs of the container in question
* "machinectl list-images" should show os-release data, as well as machine-info data (including deployment level)
* Port various tools to make use of verbs.[ch], where applicable
* "machinectl history"
* "machinectl diff"
* "machinectl commit" that takes a writable snapshot of a tree, invokes a shell in it, and marks it read-only after use
* systemd-nspawn -x should support ephemeral instances of gpt images
* hostnamectl: show root image uuid
* sysfs set api in libudev is not const
@ -228,22 +114,11 @@ Features:
* Find a solution for SMACK capabilities stuff:
http://lists.freedesktop.org/archives/systemd-devel/2014-December/026188.html
* port libmount hookup to use API's own inotify interface, as soon as that is table in libmount
* "systemctl preset-all" should probably order the unit files it
operates on lexicographically before starting to work, in order to
ensure deterministic behaviour if two unit files conflict (like DMs
do, for example)
* resolved should optionally register additional per-interface LLMNR
names, so that for the container case we can establish the same name
(maybe "host") for referencing the server, everywhere.
* systemd-journal-upload (or a new, related tool): allow pushing out
journal messages onto the network in BSD syslog protocol,
continuously. Default to some link-local IP mcast group, to make this
useful as a one-stop debugging tool.
* synchronize console access with BSD locks:
http://lists.freedesktop.org/archives/systemd-devel/2014-October/024582.html
@ -263,24 +138,16 @@ Features:
* firstboot: make it useful to be run immediately after yum --installroot to set up a machine. (most specifically, make --copy-root-password work even if /etc/passwd already exists
* timesyncd + resolved: add ugly bus calls to set NTP and DNS servers per-interface, for usage by NM
* add infrastructure to allocate dynamic/transient users and UID ranges, for use in user-namespaced containers, per-seat gdm login screens and gdm guest sessions
* machined: add an API so that libvirt-lxc can inform us about network interfaces being removed or added to an existing machine
* maybe add support for specifier expansion in user.conf, specifically DefaultEnvironment=
* code cleanup: retire FOREACH_WORD_QUOTED, port to extract_first_word() loops instead
* introduce systemd-timesync-wait.service or so to sync on an NTP fix?
* systemd --user should issue sd_notify() upon reaching basic.target, not on becoming idle
* consider showing the unit names during boot up in the status output, not just the unit descriptions
* dhcp: do we allow configuring dhcp routes on interfaces that are not the one we got the dhcp info from?
* maybe allow timer units with an empty Units= setting, so that they
can be used for resuming the system but nothing else.
@ -290,12 +157,8 @@ Features:
* maybe support a new very "soft" reboot mode, that simply kills all processes, disassembles everything, flushes /run and sysvipc, and then reexecs systemd again
* man: document that corrupted journal files is nothing to act on
* man: maybe use the word "inspect" rather than "introspect"?
* "machinectl list" should probably show columns for OS version and IP addresses
* systemctl: if some operation fails, show log output?
* systemctl edit:
@ -303,10 +166,10 @@ Features:
- use equvalent of cat() to insert existing config as a comment, prepended with #.
Upon editor exit, lines with one # are removed, lines with two # are left with one #, etc.
* refcounting in sd-resolve is borked
* exponential backoff in timesyncd and resolved when we cannot reach a server
* timesyncd + resolved: add ugly bus calls to set NTP and DNS servers per-interface, for usage by NM
* extract_many_words() should probably be used by a lot of code that
currently uses FOREACH_WORD and friends. For example, most conf
parsing callbacks should use it.
@ -319,24 +182,6 @@ Features:
* add systemd.abort_on_kill or some other such flag to send SIGABRT instead of SIGKILL
(throughout the codebase, not only PID1)
* networkd:
- add LLDP client side support
- the DHCP lease data (such as NTP/DNS) is still made available when
a carrier is lost on a link. It should be removed instantly.
- expose in the API the following bits:
- option 15, domain name and/or option 119, search list
- option 12, host name and/or option 81, fqdn
- option 123, 144, geolocation
- option 252, configure http proxy (PAC/wpad)
- provide a way to define a per-network interface default metric value
for all routes to it. possibly a second default for DHCP routes.
- allow Name= to be specified repeatedly in the [Match] section. Maybe also
support Name=foo*|bar*|baz ?
- duplicate address check for static IPs (like ARPCHECK in network-scripts)
- allow DUID/IAID to be customized, see issue #394.
- support configuration option for TSO (tcp segmentation offload)
- networkd: whenever uplink info changes, make DHCP server send out FORCERENEW
* resolved:
- put networkd events and rtnl events at a higher priority, so that
we always process them before we process client requests
@ -352,8 +197,11 @@ Features:
announce dname support. However, for DNSSEC it is necessary as the synthesized cname
will not be signed.
- cname on PTR (?)
- resolved should optionally register additional per-interface LLMNR
names, so that for the container case we can establish the same name
(maybe "host") for referencing the server, everywhere.
* Allow multiple ExecStart= for all Type= settings, so that we can cover rescue.service nicely
* refcounting in sd-resolve is borked
* Add a new verb "systemctl top"
@ -378,14 +226,8 @@ Features:
* Run most system services with cgroupfs read-only and procfs with a more secure mode (doesn't work, since the hidepid= option is per-pid-namespace, not per-mount)
* sd-event: generate a failure of a default event loop is executed out-of-thread
* add bus api to query unit file's X fields.
* consider adding RuntimeDirectoryUser= + RuntimeDirectoryGroup=
* sd-event: define more intervals where we will shift wakeup intervals around in, 1h, 6h, 24h, ...
* gpt-auto-generator:
- Support LUKS for root devices
- Define new partition type for encrypted swap? Support probed LUKS for encrypted swap?
@ -436,8 +278,6 @@ Features:
* when we detect low battery and no AC on boot, show pretty splash and refuse boot
* machined, localed: when we try to kill an empty cgroup, generate an ESRCH error over the bus
* libsystemd-journal, libsystemd-login, libudev: add calls to easily attach these objects to sd-event event loops
* be more careful what we export on the bus as (usec_t) 0 and (usec_t) -1
@ -495,6 +335,9 @@ Features:
* sd-event
- allow multiple signal handlers per signal?
- document chaining of signal handler for SIGCHLD and child handlers
- define more intervals where we will shift wakeup intervals around in, 1h, 6h, 24h, ...
- generate a failure of a default event loop is executed out-of-thread
- maybe add support for inotify events
* in the final killing spree, detect processes from the root directory, and
complain loudly if they have argv[0][0] == '@' set.
@ -539,14 +382,10 @@ Features:
* systemd-inhibit: make taking delay locks useful: support sending SIGINT or SIGTERM on PrepareForSleep()
* journal-or-kmsg is currently broken? See reverted commit 4a01181e460686d8b4a543b1dfa7f77c9e3c5ab8.
* remove any syslog support from log.c -- we probably cannot do this before split-off udev is gone for good
* shutdown logging: store to EFI var, and store to USB stick?
* write UI tool that pops up emergency messages from the journal as notification
* think about window-manager-run-as-user-service problem: exit 0 → activate shutdown.target; exit != 0 → restart service
* merge unit_kill_common() and unit_kill_context()
@ -560,9 +399,6 @@ Features:
* maybe do not install getty@tty1.service symlink in /etc but in /usr?
* fstab: add new mount option x-systemd-after=/foobar/waldo to allow manual dependencies to other mount points
https://bugzilla.redhat.com/show_bug.cgi?id=812826
* print a nicer explanation if people use variable/specifier expansion in ExecStart= for the first word
* mount: turn dependency information from /proc/self/mountinfo into dependency information between systemd units.
@ -592,6 +428,12 @@ Features:
probably reduce the capability set it retains substantially.
(we need CAP_SYS_ADMIN for drmSetMaster(), so maybe not worth it)
- expose orientation sensors and tablet mode through logind
- maybe allow configuration of the StopTimeout for session scopes
- rename session scope so that it includes the UID. THat way
the session scope can be arranged freely in slices and we don't have
make assumptions about their slice anymore.
- follow PropertiesChanged state more closely, to deal with quick logouts and
relogins
* exec: when deinitializating a tty device fix the perms and group, too, not only when initializing. Set access mode/gid to 0620/tty.
@ -605,7 +447,6 @@ Features:
- add API to close/reopen/get fd for journal client fd in libsystemd-journal.
- fallback to /dev/log based logging in libsystemd-journal, if we cannot log natively?
- declare the local journal protocol stable in the wiki interface chart
- journal: reuse XZ context
- sd-journal: speed up sd_journal_get_data() with transparent hash table in bg
- journald: when dropping msgs due to ratelimit make sure to write
"dropped %u messages" not only when we are about to print the next
@ -647,6 +488,32 @@ Features:
lazily. Encode just enough information in the file name, so that we
do not have to open it to know that it is not interesting for us, for
the most common operations.
- journal-or-kmsg is currently broken? See reverted
commit 4a01181e460686d8b4a543b1dfa7f77c9e3c5ab8.
- man: document that corrupted journal files is nothing to act on
- systemd-journal-upload (or a new, related tool): allow pushing out
journal messages onto the network in BSD syslog protocol,
continuously. Default to some link-local IP mcast group, to make this
useful as a one-stop debugging tool.
- rework journald sigbus stuff to use mutex
- Set RLIMIT_NPROC for systemd-journal-xyz, and all other of our
services that run under their own user ids, and use User= (but only
in a world where userns is ubiquitous since otherwise we cannot
invoke those daemons on the host AND in a container anymore). Also,
if LimitNPROC= is used without User= we should warn and refuse
operation.
- journalctl --verify: don't show files that are currently being
written to as FAIL, but instead show that their are being written to.
- add journalctl -H that talks via ssh to a remote peer and passes through
binary logs data
- change journalctl -M to acquire fd to journal directory via machined, and
then operate on that via openat() instead of absolute paths
- add a version of --merge which also merges /var/log/journal/remote
- log accumulated resource usage after each service invocation
- journalctl: -m should access container journals directly by enumerating
them via machined, and also watch containers coming and going.
Benefit: nspawn --ephemeral would start working nicely with the journal.
- assign MESSAGE_ID to log messages about failed services
* document:
- document that deps in [Unit] sections ignore Alias= fields in
@ -659,7 +526,6 @@ Features:
- document systemd-journal-flush.service properly
- documentation: recommend to connect the timer units of a service to the service via Also= in [Install]
- man: document the very specific env the shutdown drop-in tools live in
- man: extend runlevel(8) to mention that runlevels suck, and are dead. Maybe add runlevel(7) with a note about that too
- man: add more examples to man pages
- man: maybe sort directives in man pages, and take sections from --help and apply them to man too
@ -674,8 +540,6 @@ Features:
- add new command to systemctl: "systemctl system-reexec" which reexecs as many daemons as virtually possible
- systemctl enable: fail if target to alias into does not exist? maybe show how many units are enabled afterwards?
- systemctl: "Journal has been rotated since unit was started." message is misleading
- support "systemctl stop foobar@.service" to stop all units matching a certain template
- Something is wrong with symlink handling of "autovt@.service" in "systemctl list-unit-files"
- better error message if you run systemctl without systemd running
- systemctl status output should should include list of triggering units and their status
@ -690,13 +554,10 @@ Features:
o DST changes
- Support 2012-02~4 as syntax for specifying the fourth to last day of the month.
- calendarspec: support value ranges with ".." notation. Example: 2013-4..8-1
- when parsing calendar timestamps support the UTC timezone (even if we will not support arbitrary timezone specs, support UTC itself certainly makes sense), also support syntaxes such as +0200
- Modulate timer frequency based on battery state
* add libsystemd-password or so to query passwords during boot using the password agent logic
* If we show an error about a unit (such as not showing up) and it has no Description string, then show a description string generated form the reverse of unit_name_mangle().
* clean up date formatting and parsing so that all absolute/relative timestamps we format can also be parsed
* on shutdown: move utmp, wall, audit logic all into PID 1 (or logind?), get rid of systemd-update-utmp-runlevel
@ -709,7 +570,62 @@ Features:
* currently x-systemd.timeout is lost in the initrd, since crypttab is copied into dracut, but fstab is not
* nspawn:
- refuses to boot containers without /etc/machine-id (OK?), and with empty /etc/machine-id (not OK).
- to allow "linking" of nspawn containers, extend --network-bridge= so
that it can dynamically create bridge interfaces that are refcounted
by the containers on them. For each group of containers to link together
- refuses to boot containers without /etc/machine-id (OK?), and with empty
/etc/machine-id (not OK).
- nspawn -x should support ephemeral instances of gpt images
- emulate /dev/kmsg using CUSE and turn off the syslog syscall
with seccomp. That should provide us with a useful log buffer that
systemd can log to during early boot, and disconnect container logs
from the kernel's logs.
- as soon as networkd has a bus interface, hook up --network-interface=,
--network-bridge= with networkd, to trigger netdev creation should an
interface be missing
- don't copy /etc/resolv.conf from host into container unless we are in
shared-network mode
- a nice way to boot up without machine id set, so that it is set at boot
automatically for supporting --ephemeral. Maybe hash the host machine id
together with the machine name to generate the machine id for the container
- fix logic always print a final newline on output.
https://github.com/systemd/systemd/pull/272#issuecomment-113153176
- should optionally support receiving WATCHDOG=1 messages from its payload
PID 1...
- should send out sd_notify("WATCHDOG=1") messages
- optionally automatically add FORWARD rules to iptables whenever nspawn is
running, remove them when shut down.
- add a logic for cleaning up read-only, hidden container images in
/var/lib/machines that are not ancestors of any non-hidden containers
- Improve error message when --bind= is used on a non-existing source
directory
- maybe make copying of /etc/resolv.conf optional, and skip it if --read-only
is used
* machined:
- "machinectl list" should probably show columns for OS version and IP
addresses
- add an API so that libvirt-lxc can inform us about network interfaces being
removed or added to an existing machine
- "machinectl migrate" or similar to copy a container from or to a
difference host, via ssh
- man: document how update dkr images works with machinectl
http://lists.freedesktop.org/archives/systemd-devel/2015-February/028630.html
- introduce systemd-nspawn-ephemeral@.service, and hook it into
"machinectl start" with a new --ephemeral switch
- "machinectl status" should also show internal logs of the container in
question
- "machinectl list-images" should show os-release data, as well as
machine-info data (including deployment level)
- "machinectl history"
- "machinectl diff"
- "machinectl commit" that takes a writable snapshot of a tree, invokes a
shell in it, and marks it read-only after use
* importd:
- dkr: support tarsum checksum verification, if it becomes reality one day...
- dkr: convert json bits to nspawn configuration
- generate a nice warning if mkfs.btrfs is missing
* cryptsetup:
- cryptsetup-generator: allow specification of passwords in crypttab itself
@ -720,42 +636,16 @@ Features:
* hw watchdog: optionally try to use the preset watchdog timeout instead of always overriding it
https://bugs.freedesktop.org/show_bug.cgi?id=54712
* after deserializing sockets in socket.c we should reapply sockopts and things
* make timer units go away after they elapsed
* move PID 1 segfaults to /var/lib/systemd/coredump?
* create /sbin/init symlinks from the build system
* allow writing multiple conditions in unit files on one line
* MountFlags=shared acts as MountFlags=slave right now.
* drop PID 1 reloading, only do reexecing (difficult: Reload()
currently is properly synchronous, Reexec() is weird, because we
cannot delay the response properly until we are back, so instead of
being properly synchronous we just keep open the fd and close it
when done. That means clients do not get a successful method reply,
but much rather a disconnect on success.
* properly handle loop back mounts via fstab, especially regards to fsck/passno
* initialize the hostname from the fs label of /, if /etc/hostname does not exist?
* rename "userspace" to "core-os"
* load-fragment: when loading a unit file via a chain of symlinks
verify that it is not masked via any of the names traversed.
* introduce Type=pid-file
* change Requires=basic.target to RequisiteOverride=basic.target
* when breaking cycles drop sysv services first, then services from /run, then from /etc, then from /usr
* ExecOnFailure=/usr/bin/foo
* udev:
- move to LGPL
- kill scsi_id
@ -764,15 +654,17 @@ Features:
* when a service has the same env var set twice we actually store it twice and return that in systemctl show -p... We should only show the last setting
* introduce mix of BindTo and Requisite
* There's currently no way to cancel fsck (used to be possible via C-c or c on the console)
* add option to sockets to avoid activation. Instead just drop packets/connections, see http://cyberelk.net/tim/2012/02/15/portreserve-systemd-solution/
* default unix qlen is too small (10). bump sysctl? add sockopt?
* save coredump in Windows/Mozilla minidump format
* coredump:
- save coredump in Windows/Mozilla minidump format
- move PID 1 segfaults to /var/lib/systemd/coredump?
- make the handler check /proc/$PID/rlimits for RLIMIT_CORE,
and supress coredump if turned off. Then change RLIMIT_CORE to
infinity by default for all services. This then allows per-service
control of coredumping.
* support crash reporting operation modes (https://live.gnome.org/GnomeOS/Design/Whiteboards/ProblemReporting)
@ -781,31 +673,16 @@ Features:
* be able to specify a forced restart of service A where service B depends on, in case B
needs to be auto-respawned?
* when a bus name of a service disappears from the bus make sure to queue further activation requests
* tmpfiles:
- apply "x" on "D" too (see patch from William Douglas)
- replace F with f+.
- instead of ignoring unknown fields, reject them.
* for services: do not set $HOME in services unless requested
* hide PAM options in fragment parser when compile time disabled
* when we automatically restart a service, ensure we restart its rdeps, too.
* allow Type=simple with PIDFile=
https://bugzilla.redhat.com/show_bug.cgi?id=723942
* move PAM code into its own binary
* implement Register= switch in .socket units to enable registration
in Avahi, RPC and other socket registration services.
- creating new directories/subvolumes/fifos/device nodes
should not follow symlinks. None of the other adjustment or creation
calls follow symlinks.
* make sure systemd-ask-password-wall does not shutdown systemd-ask-password-console too early
* add ReloadSignal= for configuring a reload signal to use
* verify that the AF_UNIX sockets of a service in the fs still exist
when we start a service in order to avoid confusion when a user
assumes starting a service is enough to make it accessible
@ -815,8 +692,6 @@ Features:
* and a dbus call to generate target from current state
* GC unreferenced jobs (such as .device jobs)
* write blog stories about:
- hwdb: what belongs into it, lsusb
- enabling dbus services
@ -837,20 +712,59 @@ Features:
- instantiated apache, dovecot and so on
- hooking a script into various stages of shutdown/rearly booot
* allow port=0 in .socket units
* recreate systemd's D-Bus private socket file on SIGUSR2
* Support --test based on current system state
* investigate whether the gnome pty helper should be moved into systemd, to provide cgroup support.
* maybe introduce ExecRestartPre=
* dot output for --test showing the 'initial transaction'
* fingerprint.target, wireless.target, gps.target, netdevice.target
* pid1:
- .timer units should optionally support CLOCK_BOOTTIME in addition to CLOCK_MONOTONIC
- When logging about multiple units (stopping BoundTo units, conflicts, etc.),
log both units as UNIT=, so that journalctl -u triggers on both.
- generate better errors when people try to set transient properties
that are not supported...
http://lists.freedesktop.org/archives/systemd-devel/2015-February/028076.html
- maybe introduce WantsMountsFor=? Usecase:
http://lists.freedesktop.org/archives/systemd-devel/2015-January/027729.html
- recreate systemd's D-Bus private socket file on SIGUSR2
- GC unreferenced jobs (such as .device jobs)
- move PAM code into its own binary
- when we automatically restart a service, ensure we restart its rdeps, too.
- for services: do not set $HOME in services unless requested
- hide PAM options in fragment parser when compile time disabled
- Support --test based on current system state
- If we show an error about a unit (such as not showing up) and it has no Description string, then show a description string generated form the reverse of unit_name_mangle().
- after deserializing sockets in socket.c we should reapply sockopts and things
- make timer units go away after they elapsed
- drop PID 1 reloading, only do reexecing (difficult: Reload()
currently is properly synchronous, Reexec() is weird, because we
cannot delay the response properly until we are back, so instead of
being properly synchronous we just keep open the fd and close it
when done. That means clients do not get a successful method reply,
but much rather a disconnect on success.
- when breaking cycles drop sysv services first, then services from /run, then from /etc, then from /usr
- when a bus name of a service disappears from the bus make sure to queue further activation requests
* unit files:
- allow port=0 in .socket units
- maybe introduce ExecRestartPre=
- add ReloadSignal= for configuring a reload signal to use
- implement Register= switch in .socket units to enable registration
in Avahi, RPC and other socket registration services.
- allow Type=simple with PIDFile=
https://bugzilla.redhat.com/show_bug.cgi?id=723942
- allow writing multiple conditions in unit files on one line
- load-fragment: when loading a unit file via a chain of symlinks
verify that it is not masked via any of the names traversed.
- introduce Type=pid-file
- ExecOnFailure=/usr/bin/foo
- introduce mix of BindTo and Requisite
- add a concept of RemainAfterExit= to scope units
- Set NoNewPrivileges= on all of our own services, where that makes sense
- Allow multiple ExecStart= for all Type= settings, so that we can cover rescue.service nicely
- consider adding RuntimeDirectoryUser= + RuntimeDirectoryGroup=
* systemd-python:
- figure out a simple way to wait for journal events in a way that
works with ^C
@ -880,8 +794,25 @@ Features:
- add Scope= parsing option for [Network]
- properly handle routerless dhcp leases
- add more attribute support for SIT tunnel
- work with non-ethernet devices
- work with non-Ethernet devices
- add support for more bond options
- dhcp: do we allow configuring dhcp routes on interfaces that are not the one we got the dhcp info from?
- add LLDP client side support
- the DHCP lease data (such as NTP/DNS) is still made available when
a carrier is lost on a link. It should be removed instantly.
- expose in the API the following bits:
- option 15, domain name and/or option 119, search list
- option 12, host name and/or option 81, fqdn
- option 123, 144, geolocation
- option 252, configure http proxy (PAC/wpad)
- provide a way to define a per-network interface default metric value
for all routes to it. possibly a second default for DHCP routes.
- allow Name= to be specified repeatedly in the [Match] section. Maybe also
support Name=foo*|bar*|baz ?
- duplicate address check for static IPs (like ARPCHECK in network-scripts)
- allow DUID/IAID to be customized, see issue #394.
- support configuration option for TSO (tcp segmentation offload)
- whenever uplink info changes, make DHCP server send out FORCERENEW
* networkd-wait-online:
- make operstates to wait for configurable?
@ -919,12 +850,8 @@ External:
* drop accountsservice's StandardOutput=syslog and Type=dbus fields
* dbus upstream still refers to dbus.target and should not
* dbus: in fedora, make /var/lib/dbus/machine-id a symlink to /etc/machine-id
* add "# export SYSTEMD_PAGER=" to bash login
* /usr/bin/service should actually show the new command line
* fedora: suggest auto-restart on failure, but not on success and not on coredump. also, ask people to think about changing the start limit logic. Also point people to RestartPreventExitStatus=, SuccessExitStatus=
@ -957,7 +884,3 @@ Regularly:
* use secure_getenv() instead of getenv() where appropriate
* link up selected blog stories from man pages and unit files Documentation= fields
Scheduled for removal or fixing:
* xxxOverridable dependencies (probably: fix)

261
catalog/systemd.da.catalog Normal file
View File

@ -0,0 +1,261 @@
# This file is part of systemd.
#
# Copyright 2012 Lennart Poettering
#
# 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.
#
# systemd is distributed in the hope that it will be useful, but
# WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
# Lesser General Public License for more details.
#
# You should have received a copy of the GNU Lesser General Public License
# along with systemd; If not, see <http://www.gnu.org/licenses/>.
# Message catalog for systemd's own messages
# Danish translation
# The catalog format is documented on
# http://www.freedesktop.org/wiki/Software/systemd/catalog
# For an explanation why we do all this, see https://xkcd.com/1024/
-- f77379a8490b408bbe5f6940505a777b
Subject: Journalen er blevet startet
Defined-By: systemd
Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel
System-journal processen har startet op, åbnet journal filerne for
tilskrivning og er nu klar til at modtage anmodninger.
-- d93fb3c9c24d451a97cea615ce59c00b
Subject: Journalen er blevet stoppet
Defined-By: systemd
Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel
System-journal processen er stoppet og har lukket alle aktive journal
filer.
-- a596d6fe7bfa4994828e72309e95d61e
Subject: Beskeder fra en service er blevet undertrykt
Defined-By: systemd
Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel
Documentation: man:journald.conf(5)
En service har logget for mange beskeder inden for en given tidsperiode.
Beskeder fra omtalte service er blevet smidt væk.
Kun beskeder fra omtalte service er smidt væk. Beskeder fra andre
services er ikke påvirket.
Grænsen for hvornår beskeder bliver smidt væk kan konfigureres
med RateLimitInterval= og RateLimitBurst= i
/etc/systemd/journald.conf. Se journald.conf(5) for detaljer herom.
-- e9bf28e6e834481bb6f48f548ad13606
Subject: Journal beskeder er gået tabt
Defined-By: systemd
Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel
Kernel beskeder er gået tabt da journal systemet ikke har været i stand
til at håndtere dem hurtigt nok.
-- fc2e22bc6ee647b6b90729ab34a250b1
Subject: Fejl-fil genereret for process @COREDUMP_PID@ (@COREDUMP_COMM@)
Defined-By: systemd
Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel
Documentation: man:core(5)
Process @COREDUMP_PID@ (@COREDUMP_COMM@) har lukket ned og genereret en
fejl-fil.
Dette indikerer som regel en programmeringsfejl i det nedlukkede program
og burde blive reporteret som en bug til folkene bag
-- 8d45620c1a4348dbb17410da57c60c66
Subject: En ny session @SESSION_ID@ er blevet lavet for bruger @USER_ID@
Defined-By: systemd
Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel
Documentation: http://www.freedesktop.org/wiki/Software/systemd/multiseat
En ny session med ID @SESSION_ID@ er blevet lavet for brugeren @USER_ID@.
Den ledende process for sessionen er @LEADER@.
-- 3354939424b4456d9802ca8333ed424a
Subject: Session @SESSION_ID@ er blevet lukket ned
Defined-By: systemd
Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel
Documentation: http://www.freedesktop.org/wiki/Software/systemd/multiseat
En session med ID @SESSION_ID@ er blevet lukket ned.
-- fcbefc5da23d428093f97c82a9290f7b
Subject: En ny arbejdsstation $SEAT_ID@ er nu tilgængelig
Defined-By: systemd
Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel
Documentation: http://www.freedesktop.org/wiki/Software/systemd/multiseat
En ny arbejdsstation @SEAT_ID@ er blevet konfigureret og er nu tilgængelig.
-- e7852bfe46784ed0accde04bc864c2d5
Subject: Arbejdsstation @SEAT_ID@ er nu blevet fjernet
Defined-By: systemd
Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel
Documentation: http://www.freedesktop.org/wiki/Software/systemd/multiseat
En arbejdsstation @SEAT_ID@ er blevet fjernet og er ikke længere tilgængelig.
-- c7a787079b354eaaa9e77b371893cd27
Subject: Tidsændring
Defined-By: systemd
Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel
Systemtiden er blevet ændret til @REALTIME@ mikrosekunder efter d. 1. Januar 1970.
-- 45f82f4aef7a4bbf942ce861d1f20990
Subject: Tidszoneændring til @TIMEZONE@
Defined-By: systemd
Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel
Tidszonen for systemet er blevet ændret til @TIMEZONE@.
-- b07a249cd024414a82dd00cd181378ff
Subject: Opstart af systemet er nu fuldført
Defined-By: systemd
Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel
Alle system services i kø til at køre ved opstart, er blevet startet
med success. Bemærk at dette ikke betyder at maskinen er i dvale, da
services stadig kan være i gang med at færdiggøre deres opstart.
Opstart af kernel tog @KERNEL_USEC@ mikrosekunder.
Opstart af initrd tog @INITRD_USEC@ mikrosekunder.
Opstart af userspace tog @USERSPACE_USEC@ mikrosekunder.
-- 6bbd95ee977941e497c48be27c254128
Subject: System slumretilstand @SLEEP@ trådt i kraft
Defined-By: systemd
Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel
System er nu gået i @SLEEP@ slumretilstand.
-- 8811e6df2a8e40f58a94cea26f8ebf14
Subject: System slumretilstand @SLEEP@ forladt
Defined-By: systemd
Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel
Systemet har nu forladt @SLEEP@ slumretilstand.
-- 98268866d1d54a499c4e98921d93bc40
Subject: Systemnedlukning påbegyndt
Defined-By: systemd
Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel
Systemnedlukning er blevet påbegyndt. Nedlukningen er nu begyndt og
alle system services er blevet afbrudt og alle filsystemer afmonteret.
-- 7d4958e842da4a758f6c1cdc7b36dcc5
Subject: Enhed @UNIT@ har påbegyndt opstart
Defined-By: systemd
Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel
Enhed @UNIT@ er begyndt at starte op.
-- 39f53479d3a045ac8e11786248231fbf
Subject: Enhed @UNIT har færdiggjort opstart
Defined-By: systemd
Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel
Enhed @UNIT@ er færdig med at starte op.
Resultat for opstart er @RESULT@.
-- de5b426a63be47a7b6ac3eaac82e2f6f
Subject: Enhed @UNIT@ har påbegyndt nedlukning
Defined-By: systemd
Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel
Enhed @UNIT@ har påbegyndt nedlukning.
-- 9d1aaa27d60140bd96365438aad20286
Subject: Enhed @UNIT@ har færdiggjort nedlukning
Defined-By: systemd
Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel
Enhed @UNIT@ har færdiggjort nedlukning.
-- be02cf6855d2428ba40df7e9d022f03d
Subject: Enhed @UNIT@ har fejlet
Defined-By: systemd
Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel
Enhed @UNIT@ har fejlet.
Resultatet er @RESULT@
-- d34d037fff1847e6ae669a370e694725
Subject: Enhed @UNIT@ har påbegyndt genindlæsning af sin konfiguration
Defined-By: systemd
Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel
Enhed @UNIT@ er begyndt at genindlæse sin konfiguration
-- 7b05ebc668384222baa8881179cfda54
Subject: Enhed @UNIT@ har færdiggjort genindlæsning af sin konfiguration
Defined-By: systemd
Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel
Enhed @UNIT@ er færdig med at genindlæse sin konfiguration
Resultatet er: @RESULT@.
-- 641257651c1b4ec9a8624d7a40a9e1e7
Subject: Process @EXECUTABLE@ kunne ikke eksekveres
Defined-By: systemd
Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel
Processen @EXECUTABLE@ kunne ikke eksekveres og fejlede.
Processens returnerede fejlkode er @ERRNO@.
-- 0027229ca0644181a76c4e92458afa2e
Subject: Èn eller flere beskeder kunne ikke videresendes til syslog
Defined-By: systemd
Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel
Èn eller flere beskeder kunne ikke videresendes til syslog servicen
der kører side-om-side med journald. Dette indikerer typisk at syslog
implementationen ikke har kunnet følge med mængden af ventende beskeder.
-- 1dee0369c7fc4736b7099b38ecb46ee7
Subject: Monteringspunkt er ikke tomt
Defined-By: systemd
Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel
Folderen @WHERE@ er specificeret som monteringspunkt (andet felt i
/etc/fstab eller Where= feltet i systemd enhedsfil) men er ikke tom.
Dette forstyrrer ikke monteringen, men de pre-eksisterende filer i folderen
bliver utilgængelige. For at se de over-monterede filer; montér det
underlæggende filsystem til en anden lokation.
-- 24d8d4452573402496068381a6312df2
Subject: En virtuel maskine eller container er blevet startet
Defined-By: systemd
Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel
Den virtuelle maskine @NAME@ med dens leder PID @LEADER@ er blevet
startet og er klar til brug.
-- 58432bd3bace477cb514b56381b8a758
Subject: En virtuel maskine eller container er blevet afbrudt
Defined-By: systemd
Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel
Den virtuelle maskine @NAME@ med dens leder PID @LEADER@ er blevet
nedlukket.

264
catalog/systemd.ko.catalog Normal file
View File

@ -0,0 +1,264 @@
# This file is part of systemd.
#
# Copyright 2012 Lennart Poettering
#
# 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.
#
# systemd is distributed in the hope that it will be useful, but
# WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
# Lesser General Public License for more details.
#
# You should have received a copy of the GNU Lesser General Public License
# along with systemd; If not, see <http://www.gnu.org/licenses/>.
# Message catalog for systemd's own messages
# Korean translation
# The catalog format is documented on
# http://www.freedesktop.org/wiki/Software/systemd/catalog
# For an explanation why we do all this, see https://xkcd.com/1024/
#
# Translator :
# Seong-ho Cho <darkcircle.0426@gmail.com>, 2015.
-- f77379a8490b408bbe5f6940505a777b
Subject: 저널 시작
Defined-By: systemd
Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel
시스템 저널 프로세스를 시작했고 기록목적으로 저널 파일을 열었으며,
프로세스 요청을 기다리고 있습니다.
-- d93fb3c9c24d451a97cea615ce59c00b
Subject: 저널 멈춤
Defined-By: systemd
Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel
시스템 저널 프로세스를 껐고 현재 활성화 중인 저널 파일을 모두
닫았습니다.
-- a596d6fe7bfa4994828e72309e95d61e
Subject: 서비스의 메시지를 거절함
Defined-By: systemd
Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel
Documentation: man:journald.conf(5)
일정 시간동안 서비스에서 너무 많은 메시지를 기록했습니다.
서비스에서 오는 메시지를 거절했습니다.
의문점이 있는 서비스로부터 오는 메시지만 거절했음을 참고하십시오
다른 서비스의 메시지에는 영향을 주지 않습니다.
메시지 거절 제어 제한 값은 /etc/systemd/journald.conf 의
RateLimitInterval= 변수와 RateLimitBurst= 변수로 설정합니다.
자세한 내용은 ournald.conf(5)를 살펴보십시오.
-- e9bf28e6e834481bb6f48f548ad13606
Subject: 저널 메시지 놓침
Defined-By: systemd
Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel
저널 시스템에서 커널 메시지를 충분히 빠르게 처리할 수 없어 커널
메시지를 잃었습니다.
-- fc2e22bc6ee647b6b90729ab34a250b1
Subject: 프로세스 @COREDUMP_PID@번 코어 덤프(@COREDUMP_COMM@) 생성함
Defined-By: systemd
Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel
Documentation: man:core(5)
프로세스 @COREDUMP_PID@번 (@COREDUMP_COMM@)이 비정상적으로 끝나
코어 덤프를 생성했습니다.
보통 비정상 종료 관리 프로그램에서 프로그래밍 오류를 나타내며,
제작자에게 버그로 보고해야합니다.
-- 8d45620c1a4348dbb17410da57c60c66
Subject: @USER_ID@ 사용자의 새 @SESSION_ID@ 세션 만듦
Defined-By: systemd
Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel
Documentation: http://www.freedesktop.org/wiki/Software/systemd/multiseat
@USER_ID@ 사용자의 새 @SESSION_ID@ 세션을 만들었습니다.
이 세션의 관리 프로세스는 @LEADER@ 입니다.
-- 3354939424b4456d9802ca8333ed424a
Subject: @SESSION_ID@ 세션 마침
Defined-By: systemd
Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel
Documentation: http://www.freedesktop.org/wiki/Software/systemd/multiseat
@SESSION_ID@ 세션을 끝냈습니다.
-- fcbefc5da23d428093f97c82a9290f7b
Subject: 새 @SEAT_ID@ 시트 사용할 수 있음
Defined-By: systemd
Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel
Documentation: http://www.freedesktop.org/wiki/Software/systemd/multiseat
새 @SEAT_ID@ 시트를 설정했고 사용할 수 있습니다.
-- e7852bfe46784ed0accde04bc864c2d5
Subject: @SEAT_ID@ 시트 제거함
Defined-By: systemd
Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel
Documentation: http://www.freedesktop.org/wiki/Software/systemd/multiseat
@SEAT_ID@ 시트를 제거했으며 더이상 사용할 수 없습니다.
-- c7a787079b354eaaa9e77b371893cd27
Subject: 시간 바꿈
Defined-By: systemd
Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel
시스템 시계를 1970년 1월 1일 이후로 @REALTIME@ 마이크로초 지난 값으로
설정했습니다.
-- 45f82f4aef7a4bbf942ce861d1f20990
Subject: @TIMEZONE@ 시간대로 시간대 바꿈
Defined-By: systemd
Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel
시스템 시간대를 @TIMEZONE@ 시간대로 바꾸었습니다.
-- b07a249cd024414a82dd00cd181378ff
Subject: 시스템 시동 마침
Defined-By: systemd
Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel
부팅 과정에 시작하려고 준비한 모든 시스템 서비스를 성공적으로
시작했습니다. 머신이 서비스처럼 대기중이라는 의미는 아니며
지동을 완전히 마칠 때까지 사용중일 수도 있는 점 참고하십시오.
커널 시동에 @KERNEL_USEC@ 마이크로초가 걸립니다.
초기 램 디스크 시동에 @INITRD_USEC@ 마이크로초가 걸립니다.
사용자 영역 시동에 @USERSPACE_USEC@ 마이크로초가 걸립니다.
-- 6bbd95ee977941e497c48be27c254128
Subject: @SLEEP@ 대기 상태 진입
Defined-By: systemd
Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel
@SLEEP@ 대기 상태로 진입했습니다.
-- 8811e6df2a8e40f58a94cea26f8ebf14
Subject: @SLEEP@ 대기 상태 마침
Defined-By: systemd
Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel
@SLEEP@ 대기 상태를 마쳤습니다.
-- 98268866d1d54a499c4e98921d93bc40
Subject: 컴퓨터 끄기 시작
Defined-By: systemd
Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel
컴퓨터 끄기 동작을 시작했습니다. 모든 시스템 동작을 멈추고
모든 파일 시스템의 마운트를 해제합니다.
-- 7d4958e842da4a758f6c1cdc7b36dcc5
Subject: @UNIT@ 유닛 시작
Defined-By: systemd
Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel
@UNIT@ 유닛을 시작했습니다.
-- 39f53479d3a045ac8e11786248231fbf
Subject: @UNIT@ 유닛 시동 마침
Defined-By: systemd
Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel
@UNIT@ 유닛 시동을 마쳤습니다.
시동 결과는 @RESULT@ 입니다.
-- de5b426a63be47a7b6ac3eaac82e2f6f
Subject: @UNIT@ 유닛 끝내기 동작 시작
Defined-By: systemd
Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel
@UNIT@ 유닛 끝내기 동작을 시작했습니다.
-- 9d1aaa27d60140bd96365438aad20286
Subject: @UNIT@ 유닛 끝내기 동작 마침
Defined-By: systemd
Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel
@UNIT@ 유닛 끝내기 동작을 마쳤습니다.
-- be02cf6855d2428ba40df7e9d022f03d
Subject: @UNIT@ 유닛 동작 실패
Defined-By: systemd
Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel
@UNIT@ 유닛 동작에 실패했습니다.
결과는 @RESULT@ 입니다.
-- d34d037fff1847e6ae669a370e694725
Subject: @UNIT@ 유닛 설정 다시 읽기 시작
Defined-By: systemd
Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel
@UNIT@ 유닛의 설정 다시 읽기를 시작했습니다
-- 7b05ebc668384222baa8881179cfda54
Subject: @UNIT@ 유닛 설정 다시 읽기 완료
Defined-By: systemd
Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel
@UNIT@ 유닛의 설정 다시 읽기 동작을 끝냈습니다.
결과는 @RESULT@ 입니다.
-- 641257651c1b4ec9a8624d7a40a9e1e7
Subject: @EXECUTABLE@ 프로세스 시작할 수 없음
Defined-By: systemd
Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel
@EXECUTABLE@ 프로세스를 시작할 수 없어 실행에 실패했습니다.
이 프로세스에서 반환한 오류 번호는 @ERRNO@번 입니다.
-- 0027229ca0644181a76c4e92458afa2e
Subject: 하나 이상의 메시지를 syslog에 전달할 수 없음
Defined-By: systemd
Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel
journald 서비스와 동시에 실행중인 syslog 서비스에 하나 이상의 메시지를
전달할 수 없습니다. 보통 순차적으로 오는 메시지의 속도를 syslog 구현체가
따라가지 못함을 의미합니다.
-- 1dee0369c7fc4736b7099b38ecb46ee7
Subject: 마운트 지점 비어있지 않음
Defined-By: systemd
Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel
@WHERE@ 디렉터리를 마운트 지점으로 지정했으며 (/etc/fstab 파일의
두번째 필드 또는 systemd 유닛 파일의 Where= 필드) 비어있지 않습니다.
마운트 과정에 방해가 되진 않지만 이전에 이 디렉터리에 존재하는 파일에
접근할 수 없게 됩니다. 중복으로 마운트한 파일을 보려면, 근본 파일
시스템의 다음 위치에 직접 마운트하십시오.
-- 24d8d4452573402496068381a6312df2
Subject: 가상 머신 또는 컨테이너 시작
Defined-By: systemd
Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel
@LEADER@ 프로세스 ID로 동작하는 @NAME@ 가상 머신을 시작했으며,
이제부터 사용할 수 있습니다.
-- 58432bd3bace477cb514b56381b8a758
Subject: 가상 머신 또는 컨테이너 마침
Defined-By: systemd
Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel
@LEADER@ 프로세스 ID로 동작하는 @NAME@ 가상 머신을 껐습니다.

View File

@ -0,0 +1,253 @@
# This file is part of systemd.
#
# Copyright 2012 Lennart Poettering
# Copyright 2015 Boyuan Yang
#
# 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.
#
# systemd is distributed in the hope that it will be useful, but
# WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
# Lesser General Public License for more details.
#
# You should have received a copy of the GNU Lesser General Public License
# along with systemd; If not, see <http://www.gnu.org/licenses/>.
# Message catalog for systemd's own messages
# Simplified Chinese translation
# 本 catalog 文档格式被记载在
# http://www.freedesktop.org/wiki/Software/systemd/catalog
# 如需了解我们为什么做这些工作,请见 https://xkcd.com/1024/
-- f77379a8490b408bbe5f6940505a777b
Subject: 日志已开始
Defined-By: systemd
Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel
系统日志进程已启动,已打开供写入的日志文件并准备好处理请求。
-- d93fb3c9c24d451a97cea615ce59c00b
Subject: 日志已停止
Defined-By: systemd
Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel
系统日志进程已终止,并已关闭所有当前活动的日志文件。
-- a596d6fe7bfa4994828e72309e95d61e
Subject: 由某个服务而来的消息已被抑制
Defined-By: systemd
Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel
Documentation: man:journald.conf(5)
某个服务在一个时间周期内记录了太多消息。
从该服务而来的消息已被丢弃。
请注意只有由有问题的服务传来的消息被丢弃,
其它服务的消息不受影响。
可以在 /etc/systemd/journald.conf 中设定 RateLimitInterval=
以及 RateLimitBurst = 的值以控制丢弃信息的限制。
请参见 journald.conf(5) 以了解详情。
-- e9bf28e6e834481bb6f48f548ad13606
Subject: 日志消息已遗失
Defined-By: systemd
Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel
因日志系统对内核消息的处理速度不够快,
部分信息已经遗失。
-- fc2e22bc6ee647b6b90729ab34a250b1
Subject: 进程 @COREDUMP_PID@ (@COREDUMP_COMM@) 核心已转储
Defined-By: systemd
Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel
Documentation: man:core(5)
进程 @COREDUMP_PID@ (@COREDUMP_COMM@) 已崩溃并进行核心转储。
这通常意味着崩溃程序中存在编程错误,并应当将此错误向其开发者报告。
-- 8d45620c1a4348dbb17410da57c60c66
Subject: 一个新会话 @SESSION_ID@ 已为用户 @USER_ID@ 建立
Defined-By: systemd
Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel
Documentation: http://www.freedesktop.org/wiki/Software/systemd/multiseat
一个 ID 为 @SESSION_ID@ 的新会话已为用户 @USER_ID@ 建立。
该会话的首进程为 @LEADER@。
-- 3354939424b4456d9802ca8333ed424a
Subject: 会话 @SESSION_ID@ 已终止
Defined-By: systemd
Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel
Documentation: http://www.freedesktop.org/wiki/Software/systemd/multiseat
一个 ID 为 @SESSION_ID@ 的会话已终止。
-- fcbefc5da23d428093f97c82a9290f7b
Subject: 一个新的座位 @SEAT_ID@ 可用
Defined-By: systemd
Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel
Documentation: http://www.freedesktop.org/wiki/Software/systemd/multiseat
一个新的座位 @SEAT_ID@ 已被配置并已可用。
-- e7852bfe46784ed0accde04bc864c2d5
Subject: 座位 @SEAT_ID@ 已被移除
Defined-By: systemd
Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel
Documentation: http://www.freedesktop.org/wiki/Software/systemd/multiseat
座位 @SEAT_ID@ 已被移除并不再可用。
-- c7a787079b354eaaa9e77b371893cd27
Subject: 时间已变更
Defined-By: systemd
Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel
系统时钟已变更为1970年1月1日后 @REALTIME@ 微秒。
-- 45f82f4aef7a4bbf942ce861d1f20990
Subject: 时区变更为 @TIMEZONE@
Defined-By: systemd
Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel
系统时区已变更为 @TIMEZONE@。
-- b07a249cd024414a82dd00cd181378ff
Subject: 系统启动已完成
Defined-By: systemd
Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel
所有系统启动时需要的系统服务均已成功启动。
请注意这并不代表现在机器已经空闲,因为某些服务可能仍处于完成启动的过程中。
内核启动使用了 @KERNEL_USEC@ 毫秒。
初始内存盘启动使用了 @INITRD_USEC@ 毫秒。
用户空间启动使用了 @USERSPACE_USEC@ 毫秒。
-- 6bbd95ee977941e497c48be27c254128
Subject: 系统已进入 @SLEEP@ 睡眠状态
Defined-By: systemd
Support: http://lists.freedesktop.org/mailman/listinfo/systemd-deve
系统现已进入 @SLEEP@ 睡眠状态。
-- 8811e6df2a8e40f58a94cea26f8ebf14
Subject: 系统已离开 @SLEEP@ 睡眠状态
Defined-By: systemd
Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel
系统现已离开 @SLEEP@ 睡眠状态。
-- 98268866d1d54a499c4e98921d93bc40
Subject: 系统关机已开始
Defined-By: systemd
Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel
系统关机操作已初始化。
关机已开始,所有系统服务均已结束,所有文件系统已卸载。
-- 7d4958e842da4a758f6c1cdc7b36dcc5
Subject: @UNIT@ 单元已开始启动
Defined-By: systemd
Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel
@UNIT@ 单元已开始启动。
-- 39f53479d3a045ac8e11786248231fbf
Subject: @UNIT@ 单元已结束启动
Defined-By: systemd
Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel
@UNIT@ 单元已结束启动。
启动结果为“@RESULT@”。
-- de5b426a63be47a7b6ac3eaac82e2f6f
Subject: @UNIT@ 单元已开始停止操作
Defined-By: systemd
Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel
@UNIT@ 单元已开始停止操作。
-- 9d1aaa27d60140bd96365438aad20286
Subject: @UNIT@ 单元已结束停止操作
Defined-By: systemd
Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel
@UNIT@ 单元已结束停止操作。
-- be02cf6855d2428ba40df7e9d022f03d
Subject: @UNIT@ 单元已失败
Defined-By: systemd
Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel
@UNIT@ 单元已失败。
结果为“@RESULT@”。
-- d34d037fff1847e6ae669a370e694725
Subject: @UNIT@ 单元已开始重新载入其配置
Defined-By: systemd
Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel
@UNIT@ 单元已开始重新载入其配置。
-- 7b05ebc668384222baa8881179cfda54
Subject: @UNIT@ 单元已结束配置重载入
Defined-By: systemd
Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel
@UNIT@ 单元已结束配置重载入操作。
结果为“@RESULT@”。
-- 641257651c1b4ec9a8624d7a40a9e1e7
Subject: 进程 @EXECUTABLE@ 无法执行
Defined-By: systemd
Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel
进程 @EXECUTABLE@ 无法被执行并已失败。
该进程返回的错误代码为 @ERRNO@。
-- 0027229ca0644181a76c4e92458afa2e
Subject: 一个或更多消息无法被转发至 syslog
Defined-By: systemd
Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel
有一条或更多的消息无法被转发至与 journald 同时运行的 syslog 服务。
这通常意味着 syslog 实现无法跟上队列中消息进入的速度。
-- 1dee0369c7fc4736b7099b38ecb46ee7
Subject: 挂载点不为空
Defined-By: systemd
Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel
目录 @WHERE@ 被指定为挂载点(即 /etc/fstab 文件的第二栏,或 systemd 单元
文件的 Where= 字段),且该目录非空。
这并不会影响挂载行为,但该目录中先前已存在的文件将无法被访问。
如需查看这些文件,请手动将其下的文件系统挂载到另一个位置。
-- 24d8d4452573402496068381a6312df2
Subject: 一个虚拟机或容器已启动
Defined-By: systemd
Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel
虚拟机 @NAME@,以及其首进程 PID @LEADER@,已被启动并可被使用。
-- 58432bd3bace477cb514b56381b8a758
Subject: 一个虚拟机或容器已被终止
Defined-By: systemd
Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel
虚拟机 @NAME@,以及其首进程 PID @LEADER@,已被关闭并停止。

View File

@ -1,48 +1,32 @@
@@
identifier r;
identifier log_LEVEL_errno =~ "^log_(debug|info|notice|warning|error|emergency)_errno$";
local idexpression r;
expression e;
@@
- r = -e;
- log_error_errno(e,
+ r = log_error_errno(e,
...);
+ r =
log_LEVEL_errno(e, ...);
@@
identifier r;
identifier log_LEVEL_errno =~ "^log_(debug|info|notice|warning|error|emergency)_errno$";
local idexpression r;
expression e;
@@
- log_error_errno(e,
+ r = log_error_errno(e,
...);
+ r =
log_LEVEL_errno(e, ...);
- r = -e;
@@
identifier r;
identifier log_LEVEL_errno =~ "^log_(debug|info|notice|warning|error|emergency)_errno$";
local idexpression r;
expression e;
@@
- r = log_error_errno(e,
+ return log_error_errno(e,
...);
- r =
+ return
log_LEVEL_errno(e, ...);
- return r;
@@
identifier r;
identifier log_LEVEL_errno =~ "^log_(debug|info|notice|warning|error|emergency)_errno$";
expression e;
@@
- r = -e;
- log_warning_errno(e,
+ r = log_warning_errno(e,
...);
@@
identifier r;
expression e;
@@
- log_warning_errno(e,
+ r = log_warning_errno(e,
...);
- r = -e;
@@
identifier r;
expression e;
@@
- r = log_warning_errno(e,
+ return log_warning_errno(e,
...);
- return r;
+ return
log_LEVEL_errno(e, ...);
- return -e;

View File

@ -20,7 +20,7 @@
AC_PREREQ([2.64])
AC_INIT([systemd],
[227],
[228],
[http://github.com/systemd/systemd/issues],
[systemd],
[http://www.freedesktop.org/wiki/Software/systemd])
@ -93,7 +93,6 @@ AC_PROG_GREP
AC_PROG_AWK
AC_PATH_PROG([M4], [m4])
AC_PATH_PROG([XSLTPROC], [xsltproc])
AC_PATH_PROG([QUOTAON], [quotaon], [/usr/sbin/quotaon], [$PATH:/usr/sbin:/sbin])
AC_PATH_PROG([QUOTACHECK], [quotacheck], [/usr/sbin/quotacheck], [$PATH:/usr/sbin:/sbin])
@ -282,7 +281,6 @@ AM_CONDITIONAL([HAVE_PYTHON], [test "x$have_python" = "xyes"])
# ------------------------------------------------------------------------------
AC_SEARCH_LIBS([dlsym], [dl], [], [AC_MSG_ERROR([*** Dynamic linking loader library not found])])
AC_CHECK_HEADERS([sys/capability.h], [], [AC_MSG_ERROR([*** POSIX caps headers not found])])
AC_CHECK_HEADERS([linux/btrfs.h], [], [])
AC_CHECK_HEADERS([linux/memfd.h], [], [])
@ -294,6 +292,7 @@ save_LIBS="$LIBS"
LIBS=
AC_SEARCH_LIBS([cap_init], [cap], [], [AC_MSG_ERROR([*** POSIX caps library not found])])
CAP_LIBS="$LIBS"
LIBS="$save_LIBS"
AC_SUBST(CAP_LIBS)
AC_CHECK_FUNCS([memfd_create])
@ -531,25 +530,27 @@ AC_SUBST(CERTIFICATEROOT)
# ------------------------------------------------------------------------------
have_xz=no
AC_ARG_ENABLE(xz, AS_HELP_STRING([--disable-xz], [Disable optional XZ support]))
if test "x$enable_xz" != "xno"; then
AS_IF([test "x$enable_xz" != "xno"], [
PKG_CHECK_MODULES(XZ, [ liblzma ],
[AC_DEFINE(HAVE_XZ, 1, [Define if XZ is available]) have_xz=yes], have_xz=no)
if test "x$have_xz" = xno -a "x$enable_xz" = xyes; then
AC_MSG_ERROR([*** XZ support requested but libraries not found])
fi
fi
[AC_DEFINE(HAVE_XZ, 1, [Define if XZ is available])
have_xz=yes],
have_xz=no)
AS_IF([test "x$have_xz" = xno -a "x$enable_xz" = xyes],
[AC_MSG_ERROR([*** XZ support requested but libraries not found])])
])
AM_CONDITIONAL(HAVE_XZ, [test "$have_xz" = "yes"])
# ------------------------------------------------------------------------------
have_zlib=no
AC_ARG_ENABLE(zlib, AS_HELP_STRING([--disable-zlib], [Disable optional ZLIB support]))
if test "x$enable_zlib" != "xno"; then
AS_IF([test "x$enable_zlib" != "xno"], [
PKG_CHECK_MODULES(ZLIB, [ zlib ],
[AC_DEFINE(HAVE_ZLIB, 1, [Define if ZLIB is available]) have_zlib=yes], have_zlib=no)
if test "x$have_zlib" = xno -a "x$enable_zlib" = xyes; then
AC_MSG_ERROR([*** ZLIB support requested but libraries not found])
fi
fi
[AC_DEFINE(HAVE_ZLIB, 1, [Define if ZLIB is available])
have_zlib=yes],
have_zlib=no)
AS_IF([test "x$have_zlib" = xno -a "x$enable_zlib" = xyes],
[AC_MSG_ERROR([*** ZLIB support requested but libraries not found])])
])
AM_CONDITIONAL(HAVE_ZLIB, [test "$have_zlib" = "yes"])
# ------------------------------------------------------------------------------
@ -557,20 +558,24 @@ have_bzip2=no
AC_ARG_ENABLE(bzip2, AS_HELP_STRING([--enable-bzip2], [Disable optional BZIP2 support]))
AS_IF([test "x$enable_bzip2" != "xno"], [
AC_CHECK_HEADERS(bzlib.h,
[AC_DEFINE(HAVE_BZIP2, 1, [Define in BZIP2 is available])
[AC_DEFINE(HAVE_BZIP2, 1, [Define if BZIP2 is available])
have_bzip2=yes],
[AS_IF([test "x$have_bzip2" = xyes], [AC_MSG_ERROR([*** BZIP2 support requested but headers not found])])
])
[AS_IF([test "x$enable_bzip2" = xyes],
[AC_MSG_ERROR([*** BZIP2 support requested but headers not found])])]
)
])
AM_CONDITIONAL(HAVE_BZIP2, [test "$have_bzip2" = "yes"])
# ------------------------------------------------------------------------------
have_lz4=no
AC_ARG_ENABLE(lz4, AS_HELP_STRING([--enable-lz4], [Enable optional LZ4 support]))
AS_IF([test "x$enable_lz4" = "xyes"], [
AC_CHECK_HEADERS(lz4.h,
[AC_DEFINE(HAVE_LZ4, 1, [Define in LZ4 is available]) have_lz4=yes],
[AC_MSG_ERROR([*** LZ4 support requested but headers not found])])
AC_ARG_ENABLE(lz4, AS_HELP_STRING([--disable-lz4], [Disable optional LZ4 support]))
AS_IF([test "x$enable_lz4" != "xno"], [
PKG_CHECK_MODULES(LZ4, [ liblz4 >= 125 ],
[AC_DEFINE(HAVE_LZ4, 1, [Define in LZ4 is available])
have_lz4=yes],
have_lz4=no)
AS_IF([test "x$have_lz4" = xno -a "x$enable_lz4" = xyes],
[AC_MSG_ERROR([*** LZ4 support requested but libraries not found])])
])
AM_CONDITIONAL(HAVE_LZ4, [test "$have_lz4" = "yes"])
@ -789,14 +794,6 @@ if test "x${have_elfutils}" != xno ; then
AC_MSG_ERROR([*** ELFUTILS headers not found.])
fi])
AC_CHECK_LIB(
[dw],
[dwfl_begin],
[],
[if test "x$have_elfutils" = xyes ; then
AC_MSG_ERROR([*** ELFUTILS libs not found.])
fi])
AC_CHECK_LIB(
[dw],
[dwfl_core_file_attach],
@ -1107,10 +1104,12 @@ AM_CONDITIONAL(ENABLE_POLKIT, [test "x$have_polkit" = "xyes"])
# ------------------------------------------------------------------------------
have_resolved=no
AC_ARG_ENABLE(resolved, AS_HELP_STRING([--disable-resolved], [disable resolve daemon]))
if test "x$enable_resolved" != "xno"; then
AS_IF([test "x$enable_resolved" != "xno"], [
AC_CHECK_LIB([dl], [dlsym], [true], [AC_MSG_ERROR([*** Dynamic linking loader library not found])])
have_resolved=yes
M4_DEFINES="$M4_DEFINES -DENABLE_RESOLVED"
fi
])
AM_CONDITIONAL(ENABLE_RESOLVED, [test "$have_resolved" = "yes"])
AC_ARG_WITH(dns-servers,
@ -1286,7 +1285,12 @@ AM_CONDITIONAL(ENABLE_HWDB, [test x$enable_hwdb = xyes])
# ------------------------------------------------------------------------------
have_manpages=no
AC_ARG_ENABLE(manpages, AS_HELP_STRING([--disable-manpages], [disable manpages]))
AS_IF([test "x$enable_manpages" != xno], [have_manpages=yes])
AS_IF([test "x$enable_manpages" != xno], [
have_manpages=yes
AC_PATH_PROG([XSLTPROC], [xsltproc])
AS_IF([test -z "$XSLTPROC"],
AC_MSG_ERROR([*** xsltproc is required for man pages]))
])
AM_CONDITIONAL(ENABLE_MANPAGES, [test "x$have_manpages" = "xyes"])
# ------------------------------------------------------------------------------

File diff suppressed because it is too large Load Diff

View File

@ -1982,3 +1982,87 @@ bluetooth:v0291*
bluetooth:v0292*
ID_VENDOR_FROM_DATABASE=SwiftSensors
bluetooth:v0293*
ID_VENDOR_FROM_DATABASE=Blue Bite
bluetooth:v0294*
ID_VENDOR_FROM_DATABASE=ELIAS GmbH
bluetooth:v0295*
ID_VENDOR_FROM_DATABASE=Sivantos GmbH
bluetooth:v0296*
ID_VENDOR_FROM_DATABASE=Petzl
bluetooth:v0297*
ID_VENDOR_FROM_DATABASE=storm power ltd
bluetooth:v0298*
ID_VENDOR_FROM_DATABASE=EISST Ltd
bluetooth:v0299*
ID_VENDOR_FROM_DATABASE=Inexess Technology Simma KG
bluetooth:v029A*
ID_VENDOR_FROM_DATABASE=Currant, Inc.
bluetooth:v029B*
ID_VENDOR_FROM_DATABASE=C2 Development, Inc.
bluetooth:v029C*
ID_VENDOR_FROM_DATABASE=Blue Sky Scientific, LLC
bluetooth:v029D*
ID_VENDOR_FROM_DATABASE=ALOTTAZS LABS, LLC
bluetooth:v029E*
ID_VENDOR_FROM_DATABASE=Kupson spol. s r.o.
bluetooth:v029F*
ID_VENDOR_FROM_DATABASE=Areus Engineering GmbH
bluetooth:v02A0*
ID_VENDOR_FROM_DATABASE=Impossible Camera GmbH
bluetooth:v02A1*
ID_VENDOR_FROM_DATABASE=InventureTrack Systems
bluetooth:v02A2*
ID_VENDOR_FROM_DATABASE=LockedUp
bluetooth:v02A3*
ID_VENDOR_FROM_DATABASE=Itude
bluetooth:v02A4*
ID_VENDOR_FROM_DATABASE=Pacific Lock Company
bluetooth:v02A5*
ID_VENDOR_FROM_DATABASE=Tendyron Corporation ( 天地融科技股份有限公司 )
bluetooth:v02A6*
ID_VENDOR_FROM_DATABASE=Robert Bosch GmbH
bluetooth:v02A7*
ID_VENDOR_FROM_DATABASE=Illuxtron international B.V.
bluetooth:v02A8*
ID_VENDOR_FROM_DATABASE=miSport Ltd.
bluetooth:v02A9*
ID_VENDOR_FROM_DATABASE=Chargelib
bluetooth:v02AA*
ID_VENDOR_FROM_DATABASE=Doppler Lab
bluetooth:v02AB*
ID_VENDOR_FROM_DATABASE=BBPOS Limited
bluetooth:v02AC*
ID_VENDOR_FROM_DATABASE=RTB Elektronik GmbH & Co. KG
bluetooth:v02AD*
ID_VENDOR_FROM_DATABASE=Rx Networks, Inc.
bluetooth:v02AE*
ID_VENDOR_FROM_DATABASE=WeatherFlow, Inc.

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

View File

@ -99,6 +99,22 @@ evdev:name:ETPS/2 Elantech Touchpad:dmi:bvn*:bvr*:bd*:svnASUSTeKComputerInc.:pnK
EVDEV_ABS_35=::18
EVDEV_ABS_36=::16
#########################################
# Dell
#########################################
# Dell Vostro 1510
evdev:name:AlpsPS/2 ALPS GlidePoint*:dmi:bvn*:bvr*:bd*:svnDellInc.:pnVostro1510*
EVDEV_ABS_00=::14
EVDEV_ABS_01=::18
# Dell Inspiron N5040
evdev:name:AlpsPS/2 ALPS DualPoint TouchPad:dmi:bvn*:bvr*:bd*:svnDellInc.:pnInspironN5040*
EVDEV_ABS_00=25:2000:22
EVDEV_ABS_01=0:1351:28
EVDEV_ABS_35=25:2000:22
EVDEV_ABS_36=0:1351:28
#########################################
# Google
#########################################
@ -119,11 +135,9 @@ evdev:name:SynPS/2 Synaptics TouchPad:dmi:*svnLENOVO*:pn*ThinkPad*X230*
EVDEV_ABS_01=::100
EVDEV_ABS_36=::100
#########################################
# Dell
#########################################
# Dell Vostro 1510
evdev:name:AlpsPS/2 ALPS GlidePoint*:dmi:bvn*:bvr*:bd*:svnDellInc.:pnVostro1510*
EVDEV_ABS_00=::14
EVDEV_ABS_01=::18
# Lenovo T510
evdev:name:SynPS/2 Synaptics TouchPad:dmi:*svnLENOVO*:pn*ThinkPad*T510*
EVDEV_ABS_00=778:6239:72
EVDEV_ABS_01=841:5330:100
EVDEV_ABS_35=778:6239:72
EVDEV_ABS_36=841:5330:100

View File

@ -495,6 +495,10 @@ evdev:atkbd:dmi:bvn*:bvr*:bd*:svnHewlett-Packard*:pnHPProBook445G1NotebookPC:pvr
evdev:atkbd:dmi:bvn*:bvr*:bd*:svnHewlett-Packard*:pnHPProBook450G0:pvr*
KEYBOARD_KEY_81=f20 # Fn+F8; Microphone mute button, should be micmute
# HP ProBook 6555b
evdev:atkbd:dmi:bvn*:bvr*:bd*:svnHewlett-Packard:pnHPProBook6555b:*
KEYBOARD_KEY_b2=www # Earth
###########################################################
# IBM
###########################################################
@ -648,10 +652,6 @@ evdev:atkbd:dmi:bvn*:bvr*:svnLENOVO*:pn*IdeaPad*Z370*:pvr*
evdev:atkbd:dmi:bvn*:bvr*:bd*:svnLENOVO*:pn*Lenovo*V480*:pvr*
KEYBOARD_KEY_f1=f21
# Thinkpad Yoga 12 (2015)
evdev:atkbd:dmi:bvn*:bvr*:bd*:svnLENOVO*:pn*:pvrThinkPadS1Yoga12*
KEYBOARD_KEY_d9=direction
# enhanced USB keyboard
evdev:input:b0003v04B3p301B*
KEYBOARD_KEY_90001=prog1 # ThinkVantage

View File

@ -311,6 +311,9 @@ mouse:usb:v046dpc05a:name:Logitech USB Optical Mouse:
mouse:usb:v046dpc065:name:Logitech USB Laser Mouse:
# Logitech V500 Cordless Notebook Mouse
mouse:usb:v046dpc510:name:Logitech USB Receiver:
# Logitech M560 Wireless Mouse
mouse:usb:v046dp402d:name:Logitech M560:
mouse:usb:v046dpc52b:name:Logitech Unifying Device. Wireless PID:402d:
MOUSE_DPI=1000@125
# Logitech V220 Cordless Optical Mouse

View File

@ -86,7 +86,7 @@
<term><varname>Frequency=25</varname></term>
<listitem><para>Configure the sample log frequency. This can
be a fractional number, but must be larger than 0.0. Most
systems can cope with values under 25-50 without impacting
systems can cope with values under 2550 without impacting
boot time severely.</para></listitem>
</varlistentry>

View File

@ -68,14 +68,14 @@
system.</para>
<para><command>bootctl status</command> checks and prints the
currently installed versions of the boot loader binaries and the
currently installed versions of the boot loader binaries and
all current EFI boot variables.</para>
<para><command>bootctl update</command> updates all installed
versions of systemd-boot, if the current version is newer than the
version installed in the EFI system partition. This also includes
the EFI default/fallback loader at /EFI/Boot/boot*.efi. A
systemd-boot entry in the EFI boot variables is created, if there
systemd-boot entry in the EFI boot variables is created if there
is no current entry. The created entry will be added to the end of
the boot order list.</para>
@ -89,7 +89,7 @@
versions of systemd-boot from the EFI system partition, and removes
systemd-boot from the EFI boot variables.</para>
<para>If no command is passed <command>status</command> is
<para>If no command is passed, <command>status</command> is
implied.</para>
</refsect1>
@ -114,7 +114,7 @@
<refsect1>
<title>Exit status</title>
<para>On success 0 is returned, a non-zero failure
<para>On success, 0 is returned, a non-zero failure
code otherwise.</para>
</refsect1>

View File

@ -127,7 +127,7 @@
<term><option>--size=</option></term>
<listitem>
<para>When used with the <command>capture</command> command
<para>When used with the <command>capture</command> command,
specifies the maximum bus message size to capture
("snaplen"). Defaults to 4096 bytes.</para>
</listitem>
@ -137,7 +137,7 @@
<term><option>--list</option></term>
<listitem>
<para>When used with the <command>tree</command> command shows a
<para>When used with the <command>tree</command> command, shows a
flat list of object paths instead of a tree.</para>
</listitem>
</varlistentry>
@ -146,9 +146,9 @@
<term><option>--quiet</option></term>
<listitem>
<para>When used with the <command>call</command> command
<para>When used with the <command>call</command> command,
suppresses display of the response message payload. Note that even
if this option is specified errors returned will still be
if this option is specified, errors returned will still be
printed and the tool will indicate success or failure with
the process exit code.</para>
</listitem>
@ -159,7 +159,7 @@
<listitem>
<para>When used with the <command>call</command> or
<command>get-property</command> command shows output in a
<command>get-property</command> command, shows output in a
more verbose format.</para>
</listitem>
</varlistentry>
@ -168,15 +168,15 @@
<term><option>--expect-reply=</option><replaceable>BOOL</replaceable></term>
<listitem>
<para>When used with the <command>call</command> command
<para>When used with the <command>call</command> command,
specifies whether <command>busctl</command> shall wait for
completion of the method call, output the returned method
response data, and return success or failure via the process
exit code. If this is set to <literal>no</literal> the
exit code. If this is set to <literal>no</literal>, the
method call will be issued but no response is expected, the
tool terminates immediately, and thus no response can be
shown, and no success or failure is returned via the exit
code. To only suppress output of the reply message payload
code. To only suppress output of the reply message payload,
use <option>--quiet</option> above. Defaults to
<literal>yes</literal>.</para>
</listitem>
@ -186,9 +186,9 @@
<term><option>--auto-start=</option><replaceable>BOOL</replaceable></term>
<listitem>
<para>When used with the <command>call</command> command specifies
<para>When used with the <command>call</command> command, specifies
whether the method call should implicitly activate the
called service should it not be running yet but is
called service, should it not be running yet but is
configured to be auto-started. Defaults to
<literal>yes</literal>.</para>
</listitem>
@ -198,7 +198,7 @@
<term><option>--allow-interactive-authorization=</option><replaceable>BOOL</replaceable></term>
<listitem>
<para>When used with the <command>call</command> command
<para>When used with the <command>call</command> command,
specifies whether the services may enforce interactive
authorization while executing the operation, if the security
policy is configured for this. Defaults to
@ -210,14 +210,14 @@
<term><option>--timeout=</option><replaceable>SECS</replaceable></term>
<listitem>
<para>When used with the <command>call</command> command
<para>When used with the <command>call</command> command,
specifies the maximum time to wait for method call
completion. If no time unit is specified assumes
completion. If no time unit is specified, assumes
seconds. The usual other units are understood, too (ms, us,
s, min, h, d, w, month, y). Note that this timeout does not
apply if <option>--expect-reply=no</option> is used as the
apply if <option>--expect-reply=no</option> is used, as the
tool does not wait for any reply message then. When not
specified or when set to 0 the default of
specified or when set to 0, the default of
<literal>25s</literal> is assumed.</para>
</listitem>
</varlistentry>
@ -229,9 +229,9 @@
<para>Controls whether credential data reported by
<command>list</command> or <command>status</command> shall
be augmented with data from
<filename>/proc</filename>. When this is turned on the data
<filename>/proc</filename>. When this is turned on, the data
shown is possibly inconsistent, as the data read from
<filename>/proc</filename> might be more recent than rest of
<filename>/proc</filename> might be more recent than the rest of
the credential information. Defaults to <literal>yes</literal>.</para>
</listitem>
</varlistentry>
@ -258,7 +258,7 @@
<term><command>list</command></term>
<listitem><para>Show all peers on the bus, by their service
names. By default shows both unique and well-known names, but
names. By default, shows both unique and well-known names, but
this may be changed with the <option>--unique</option> and
<option>--acquired</option> switches. This is the default
operation if no command is specified.</para></listitem>
@ -281,14 +281,14 @@
<replaceable>SERVICE</replaceable> is specified, show messages
to or from this peer, identified by its well-known or unique
name. Otherwise, show all messages on the bus. Use Ctrl-C to
terminate dump.</para></listitem>
terminate the dump.</para></listitem>
</varlistentry>
<varlistentry>
<term><command>capture</command> <arg choice="opt" rep="repeat"><replaceable>SERVICE</replaceable></arg></term>
<listitem><para>Similar to <command>monitor</command> but
writes the output in pcap format (for details see the <ulink
writes the output in pcap format (for details, see the <ulink
url="http://wiki.wireshark.org/Development/LibpcapFileFormat">Libpcap
File Format</ulink> description. Make sure to redirect the
output to STDOUT to a file. Tools like
@ -312,7 +312,7 @@
<listitem><para>Show interfaces, methods, properties and
signals of the specified object (identified by its path) on
the specified service. If the interface argument is passed the
the specified service. If the interface argument is passed, the
output is limited to members of the specified
interface.</para></listitem>
</varlistentry>
@ -322,10 +322,10 @@
<listitem><para>Invoke a method and show the response. Takes a
service name, object path, interface name and method name. If
parameters shall be passed to the method call a signature
parameters shall be passed to the method call, a signature
string is required, followed by the arguments, individually
formatted as strings. For details on the formatting used, see
below. To suppress output of the returned data use the
below. To suppress output of the returned data, use the
<option>--quiet</option> option.</para></listitem>
</varlistentry>
@ -335,16 +335,16 @@
<listitem><para>Retrieve the current value of one or more
object properties. Takes a service name, object path,
interface name and property name. Multiple properties may be
specified at once in which case their values will be shown one
after the other, separated by newlines. The output is by
default in terse format. Use <option>--verbose</option> for a
specified at once, in which case their values will be shown one
after the other, separated by newlines. The output is, by
default, in terse format. Use <option>--verbose</option> for a
more elaborate output format.</para></listitem>
</varlistentry>
<varlistentry>
<term><command>set-property</command> <arg choice="plain"><replaceable>SERVICE</replaceable></arg> <arg choice="plain"><replaceable>OBJECT</replaceable></arg> <arg choice="plain"><replaceable>INTERFACE</replaceable></arg> <arg choice="plain"><replaceable>PROPERTY</replaceable></arg> <arg choice="plain"><replaceable>SIGNATURE</replaceable></arg> <arg choice="plain" rep="repeat"><replaceable>ARGUMENT</replaceable></arg></term>
<listitem><para>Set the current value an object
<listitem><para>Set the current value of an object
property. Takes a service name, object path, interface name,
property name, property signature, followed by a list of
parameters formatted as strings.</para></listitem>
@ -364,19 +364,19 @@
<para>The <command>call</command> and
<command>set-property</command> commands take a signature string
followed by a list of parameters formatted as string (for details
on D-Bus signature strings see the <ulink
on D-Bus signature strings, see the <ulink
url="http://dbus.freedesktop.org/doc/dbus-specification.html#type-system">Type
system chapter of the D-Bus specification</ulink>). For simple
types each parameter following the signature should simply be the
types, each parameter following the signature should simply be the
parameter's value formatted as string. Positive boolean values may
be formatted as <literal>true</literal>, <literal>yes</literal>,
<literal>on</literal>, <literal>1</literal>; negative boolean
<literal>on</literal>, or <literal>1</literal>; negative boolean
values may be specified as <literal>false</literal>,
<literal>no</literal>, <literal>off</literal>,
<literal>no</literal>, <literal>off</literal>, or
<literal>0</literal>. For arrays, a numeric argument for the
number of entries followed by the entries shall be specified. For
variants the signature of the contents shall be specified,
followed by the contents. For dictionaries and structs the
variants, the signature of the contents shall be specified,
followed by the contents. For dictionaries and structs, the
contents of them shall be directly specified.</para>
<para>For example,
@ -395,7 +395,7 @@
array that maps strings to variants, consisting of three
entries. The string <literal>One</literal> is assigned the
string <literal>Eins</literal>. The string
<literal>Two</literal> is assigned the 32bit unsigned
<literal>Two</literal> is assigned the 32-bit unsigned
integer 2. The string <literal>Yes</literal> is assigned a
positive boolean.</para>
@ -456,8 +456,8 @@ ARRAY "s" {
of the <literal>org.freedesktop.systemd1</literal>
service, and passes it two strings
<literal>cups.service</literal> and
<literal>replace</literal>. As result of the method
call a single object path parameter is received and
<literal>replace</literal>. As a result of the method
call, a single object path parameter is received and
shown:</para>
<programlisting># busctl call org.freedesktop.systemd1 /org/freedesktop/systemd1 org.freedesktop.systemd1.Manager StartUnit ss "cups.service" "replace"

View File

@ -98,7 +98,7 @@
<term><varname>Compress=</varname></term>
<listitem><para>Controls compression for external
storage. Takes a boolean argument, defaults to
storage. Takes a boolean argument, which defaults to
<literal>yes</literal>.</para>
</listitem>
</varlistentry>
@ -135,7 +135,7 @@
coredumps are processed. Note that old coredumps are also
removed based on time via
<citerefentry><refentrytitle>systemd-tmpfiles</refentrytitle><manvolnum>8</manvolnum></citerefentry>. Set
either value to 0 to turn off size based
either value to 0 to turn off size-based
clean-up.</para></listitem>
</varlistentry>
</variablelist>

View File

@ -160,10 +160,10 @@
at the beginning. This is different from the <option>--offset</option>
option with respect to the sector numbers used in initialization vector
(IV) calculation. Using <option>--offset</option> will shift the IV
calculation by the same negative amount. Hence, if <option>--offset n</option>,
calculation by the same negative amount. Hence, if <option>--offset n</option> is given,
sector n will get a sector number of 0 for the IV calculation.
Using <option>--skip</option> causes sector n to also be the first
sector of the mapped device, but with its number for IV generation is n.</para>
sector of the mapped device, but with its number for IV generation being n.</para>
<para>This option is only relevant for plain devices.</para>
</listitem>

View File

@ -125,7 +125,7 @@
<!--
- helper template to do conflict resolution between various headings with the same inferred ID attribute/tag from the headerlink template
- this conflict resolution is necessary to prevent malformed HTML output (multiple id attributes with the same value)
- this conflict resolution is necessary to prevent malformed HTML output (multiple ID attributes with the same value)
- and it fixes xsltproc warnings during compilation of HTML man pages
-
- A simple top-to-bottom numbering scheme is implemented for nodes with the same ID value to derive unique ID values for HTML output.
@ -171,7 +171,7 @@
<!--
- If stable URLs with fragment markers (references to the ID) turn out not to be important:
- generatedID could simply take the value of generate-id(), and various other helper templates may be dropped entirely.
- Alternatively if xsltproc is patched to generate reproducible generate-id() output the same simplifications can be
- Alternatively, if xsltproc is patched to generate reproducible generate-id() output, the same simplifications can be
- applied at the cost of breaking compatibility with URLs generated from output of previous versions of this stylesheet.
-->
<xsl:variable name="generatedID">

View File

@ -490,13 +490,13 @@
configured address redundant. Another often suggested trigger
for service activation is low system load. However, here too, a
more convincing approach might be to make proper use of features
of the operating system, in particular, the CPU or IO scheduler
of the operating system, in particular, the CPU or I/O scheduler
of Linux. Instead of scheduling jobs from userspace based on
monitoring the OS scheduler, it is advisable to leave the
scheduling of processes to the OS scheduler itself. systemd
provides fine-grained access to the CPU and IO schedulers. If a
provides fine-grained access to the CPU and I/O schedulers. If a
process executed by the init system shall not negatively impact
the amount of CPU or IO bandwidth available to other processes,
the amount of CPU or I/O bandwidth available to other processes,
it should be configured with
<varname>CPUSchedulingPolicy=idle</varname> and/or
<varname>IOSchedulingClass=idle</varname>. Optionally, this may

View File

@ -84,7 +84,7 @@
<varlistentry>
<term><filename>/boot</filename></term>
<listitem><para>The boot partition used for bringing up the
system. On EFI systems this is possibly the EFI System
system. On EFI systems, this is possibly the EFI System
Partition, also see
<citerefentry><refentrytitle>systemd-gpt-auto-generator</refentrytitle><manvolnum>8</manvolnum></citerefentry>.
This directory is usually strictly local to the host, and
@ -147,14 +147,14 @@
directory is usually mounted as a <literal>tmpfs</literal>
instance, and should hence not be used for larger files. (Use
<filename>/var/tmp</filename> for larger files.) Since the
directory is accessible to other users of the system it is
directory is accessible to other users of the system, it is
essential that this directory is only written to with the
<citerefentry project='man-pages'><refentrytitle>mkstemp</refentrytitle><manvolnum>3</manvolnum></citerefentry>,
<citerefentry project='man-pages'><refentrytitle>mkdtemp</refentrytitle><manvolnum>3</manvolnum></citerefentry>
and related calls. This directory is usually flushed at
boot-up. Also, files that are not accessed within a certain
time are usually automatically deleted. If applications find
the environment variable <varname>$TMPDIR</varname> set they
the environment variable <varname>$TMPDIR</varname> set, they
should prefer using the directory specified in it over
directly referencing <filename>/tmp</filename> (see
<citerefentry project='man-pages'><refentrytitle>environ</refentrytitle><manvolnum>7</manvolnum></citerefentry>
@ -217,7 +217,7 @@
<varlistentry>
<term><filename>/usr/bin</filename></term>
<listitem><para>Binaries and executables for user commands,
<listitem><para>Binaries and executables for user commands
that shall appear in the <varname>$PATH</varname> search path.
It is recommended not to place binaries in this directory that
are not useful for invocation from a shell (such as daemon
@ -245,7 +245,7 @@
<varlistentry>
<term><filename>/usr/lib/<replaceable>arch-id</replaceable></filename></term>
<listitem><para>Location for placing dynamic libraries, also
<listitem><para>Location for placing dynamic libraries into, also
called <varname>$libdir</varname>. The architecture identifier
to use is defined on <ulink
url="https://wiki.debian.org/Multiarch/Tuples">Multiarch
@ -291,7 +291,7 @@
<term><filename>/usr/share/factory/var</filename></term>
<listitem><para>Similar to
<filename>/usr/share/factory/etc</filename> but for vendor
<filename>/usr/share/factory/etc</filename>, but for vendor
versions of files in the variable, persistent data directory
<filename>/var</filename>.</para></listitem>
@ -353,7 +353,7 @@
<varlistentry>
<term><filename>/var/tmp</filename></term>
<listitem><para>The place for larger and persistent temporary
files. In contrast to <filename>/tmp</filename> this directory
files. In contrast to <filename>/tmp</filename>, this directory
is usually mounted from a persistent physical file system and
can thus accept larger files. (Use <filename>/tmp</filename>
for smaller files.) This directory is generally not flushed at
@ -365,7 +365,7 @@
<citerefentry project='man-pages'><refentrytitle>mkdtemp</refentrytitle><manvolnum>3</manvolnum></citerefentry>
or similar calls should be used to make use of this directory.
If applications find the environment variable
<varname>$TMPDIR</varname> set they should prefer using the
<varname>$TMPDIR</varname> set, they should prefer using the
directory specified in it over directly referencing
<filename>/var/tmp</filename> (see
<citerefentry project='man-pages'><refentrytitle>environ</refentrytitle><manvolnum>7</manvolnum></citerefentry>
@ -381,7 +381,7 @@
<variablelist>
<varlistentry>
<term><filename>/dev</filename></term>
<listitem><para>The root directory for device nodes. Usually
<listitem><para>The root directory for device nodes. Usually,
this directory is mounted as a <literal>devtmpfs</literal>
instance, but might be of a different type in
sandboxed/containerized setups. This directory is managed
@ -402,10 +402,10 @@
write access to this directory, special care should be taken
to avoid name clashes and vulnerabilities. For normal users,
shared memory segments in this directory are usually deleted
when the user logs out. Usually it is a better idea to use
when the user logs out. Usually, it is a better idea to use
memory mapped files in <filename>/run</filename> (for system
programs) or <varname>$XDG_RUNTIME_DIR</varname> (for user
programs) instead of POSIX shared memory segments, since those
programs) instead of POSIX shared memory segments, since these
directories are not world-writable and hence not vulnerable to
security-sensitive name clashes.</para></listitem>
</varlistentry>
@ -427,7 +427,7 @@
that exposes a number of kernel tunables. The primary way to
configure the settings in this API file tree is via
<citerefentry><refentrytitle>sysctl.d</refentrytitle><manvolnum>5</manvolnum></citerefentry>
files. In sandboxed/containerized setups this directory is
files. In sandboxed/containerized setups, this directory is
generally mounted read-only.</para></listitem>
</varlistentry>
@ -437,7 +437,7 @@
discovered devices and other functionality. This file system
is mostly an API to interface with the kernel and not a place
where normal files may be stored. In sandboxed/containerized
setups this directory is generally mounted read-only. A number
setups, this directory is generally mounted read-only. A number
of special purpose virtual file systems might be mounted below
this directory.</para></listitem>
</varlistentry>
@ -472,7 +472,7 @@
<varlistentry>
<term><filename>/lib64</filename></term>
<listitem><para>On some architecture ABIs this compatibility
<listitem><para>On some architecture ABIs, this compatibility
symlink points to <varname>$libdir</varname>, ensuring that
binaries referencing this legacy path correctly find their
dynamic loader. This symlink only exists on architectures
@ -513,7 +513,7 @@
directory should have no effect on operation of programs,
except for increased runtimes necessary to rebuild these
caches. If an application finds
<varname>$XDG_CACHE_HOME</varname> set is should use the
<varname>$XDG_CACHE_HOME</varname> set, it should use the
directory specified in it instead of this
directory.</para></listitem>
</varlistentry>
@ -522,10 +522,10 @@
<term><filename>~/.config</filename></term>
<listitem><para>Application configuration and state. When a
new user is created this directory will be empty or not exist
new user is created, this directory will be empty or not exist
at all. Applications should fall back to defaults should their
configuration or state in this directory be missing. If an
application finds <varname>$XDG_CONFIG_HOME</varname> set is
application finds <varname>$XDG_CONFIG_HOME</varname> set, it
should use the directory specified in it instead of this
directory.</para></listitem>
</varlistentry>
@ -539,7 +539,7 @@
invocation from a shell; these should be placed in a
subdirectory of <filename>~/.local/lib</filename> instead.
Care should be taken when placing architecture-dependent
binaries in this place which might be problematic if the home
binaries in this place, which might be problematic if the home
directory is shared between multiple hosts with different
architectures.</para></listitem>
</varlistentry>
@ -555,7 +555,7 @@
<term><filename>~/.local/lib/<replaceable>arch-id</replaceable></filename></term>
<listitem><para>Location for placing public dynamic libraries.
The architecture identifier to use, is defined on <ulink
The architecture identifier to use is defined on <ulink
url="https://wiki.debian.org/Multiarch/Tuples">Multiarch
Architecture Specifiers (Tuples)</ulink>
list.</para></listitem>
@ -568,7 +568,7 @@
such as fonts or artwork. Usually, the precise location and
format of files stored below this directory is subject to
specifications that ensure interoperability. If an application
finds <varname>$XDG_DATA_HOME</varname> set is should use the
finds <varname>$XDG_DATA_HOME</varname> set, it should use the
directory specified in it instead of this
directory.</para></listitem>
</varlistentry>
@ -593,11 +593,11 @@
<filename>/run/user</filename>) of the user, which are all
writable.</para>
<para>For unprivileged system processes only
<para>For unprivileged system processes, only
<filename>/tmp</filename>,
<filename>/var/tmp</filename> and
<filename>/dev/shm</filename> are writable. If an
unprivileged system process needs a private, writable directory in
unprivileged system process needs a private writable directory in
<filename>/var</filename> or <filename>/run</filename>, it is
recommended to either create it before dropping privileges in the
daemon code, to create it via
@ -618,7 +618,7 @@
<para>It is strongly recommended that <filename>/dev</filename> is
the only location below which device nodes shall be placed.
Similar, <filename>/run</filename> shall be the only location to
Similarly, <filename>/run</filename> shall be the only location to
place sockets and FIFOs. Regular files, directories and symlinks
may be used in all directories.</para>
</refsect1>
@ -645,7 +645,7 @@
<tbody>
<row>
<entry><filename>/usr/bin</filename></entry>
<entry>Package executables that shall appear in the <varname>$PATH</varname> executable search path, compiled for any of the supported architectures compatible with the operating system. It is not recommended to place internal binaries or binaries that are not commonly invoked from the shell in this directory, such as daemon binaries. As this directory is shared with most other packages of the system special care should be taken to pick unique names for files placed here, that are unlikely to clash with other package's files.</entry>
<entry>Package executables that shall appear in the <varname>$PATH</varname> executable search path, compiled for any of the supported architectures compatible with the operating system. It is not recommended to place internal binaries or binaries that are not commonly invoked from the shell in this directory, such as daemon binaries. As this directory is shared with most other packages of the system, special care should be taken to pick unique names for files placed here, that are unlikely to clash with other package's files.</entry>
</row>
<row>
<entry><filename>/usr/lib/<replaceable>arch-id</replaceable></filename></entry>
@ -653,7 +653,7 @@
</row>
<row>
<entry><filename>/usr/lib/<replaceable>package</replaceable></filename></entry>
<entry>Private, static vendor resources of the package, including private binaries and libraries, or any other kind of read-only vendor data.</entry>
<entry>Private static vendor resources of the package, including private binaries and libraries, or any other kind of read-only vendor data.</entry>
</row>
<row>
<entry><filename>/usr/lib/<replaceable>arch-id</replaceable>/<replaceable>package</replaceable></filename></entry>
@ -668,10 +668,10 @@
</table>
<para>Additional static vendor files may be installed in the
<filename>/usr/share</filename> hierarchy, to the locations
<filename>/usr/share</filename> hierarchy to the locations
defined by the various relevant specifications.</para>
<para>During runtime and for local configuration and state
<para>During runtime, and for local configuration and state,
additional directories are defined:</para>
<table>
@ -700,7 +700,7 @@
</row>
<row>
<entry><filename>/var/cache/<replaceable>package</replaceable></filename></entry>
<entry>Persistent cache data of the package. If this directory is flushed the application should work correctly on next invocation, though possibly slowed down due to the need to rebuild any local cache files. The application must be capable of recreating this directory should it be missing and necessary.</entry>
<entry>Persistent cache data of the package. If this directory is flushed, the application should work correctly on next invocation, though possibly slowed down due to the need to rebuild any local cache files. The application must be capable of recreating this directory should it be missing and necessary.</entry>
</row>
<row>
<entry><filename>/var/lib/<replaceable>package</replaceable></filename></entry>
@ -726,7 +726,7 @@
when placing their own files in the user's home directory. The
following table lists recommended locations in the home directory
for specific types of files supplied by the vendor if the
application is installed in the home directory. (Note however,
application is installed in the home directory. (Note, however,
that user applications installed system-wide should follow the
rules outlined above regarding placing vendor files.)</para>
@ -744,7 +744,7 @@
<tbody>
<row>
<entry><filename>~/.local/bin</filename></entry>
<entry>Package executables that shall appear in the <varname>$PATH</varname> executable search path. It is not recommended to place internal executables or executables that are not commonly invoked from the shell in this directory, such as daemon executables. As this directory is shared with most other packages of the user special care should be taken to pick unique names for files placed here, that are unlikely to clash with other package's files.</entry>
<entry>Package executables that shall appear in the <varname>$PATH</varname> executable search path. It is not recommended to place internal executables or executables that are not commonly invoked from the shell in this directory, such as daemon executables. As this directory is shared with most other packages of the user, special care should be taken to pick unique names for files placed here, that are unlikely to clash with other package's files.</entry>
</row>
<row>
<entry><filename>~/.local/lib/<replaceable>arch-id</replaceable></filename></entry>
@ -763,10 +763,10 @@
</table>
<para>Additional static vendor files may be installed in the
<filename>~/.local/share</filename> hierarchy, to the locations
<filename>~/.local/share</filename> hierarchy to the locations
defined by the various relevant specifications.</para>
<para>During runtime and for local configuration and state
<para>During runtime, and for local configuration and state,
additional directories are defined:</para>
<table>
@ -791,7 +791,7 @@
</row>
<row>
<entry><filename>~/.cache/<replaceable>package</replaceable></filename></entry>
<entry>Persistent cache data of the package. If this directory is flushed the application should work correctly on next invocation, though possibly slowed down due to the need to rebuild any local cache files. The application must be capable of recreating this directory should it be missing and necessary.</entry>
<entry>Persistent cache data of the package. If this directory is flushed, the application should work correctly on next invocation, though possibly slowed down due to the need to rebuild any local cache files. The application must be capable of recreating this directory should it be missing and necessary.</entry>
</row>
</tbody>
</tgroup>

View File

@ -34,7 +34,7 @@
<refsect1><title>Description</title>
<para>The hardware database is a key-value store for associating modalias-like keys to
udev-properties-like values. It is used primarily by udev to add the relevant properties
udev-property-like values. It is used primarily by udev to add the relevant properties
to matching devices, but it can also be queried directly.</para>
</refsect1>
@ -55,9 +55,9 @@
<para>The hwdb file contains data records consisting of matches and
associated key-value pairs. Every record in the hwdb starts with one or
more match string, specifying a shell glob to compare the database
more match strings, specifying a shell glob to compare the database
lookup string against. Multiple match lines are specified in additional
consecutive lines. Every match line is compared individually, they are
consecutive lines. Every match line is compared individually, and they are
combined by OR. Every match line must start at the first character of
the line.</para>
@ -71,7 +71,7 @@
and compiled to a binary database located at <filename>/etc/udev/hwdb.bin</filename>,
or alternatively <filename>/usr/lib/udev/hwdb.bin</filename> if you want ship the compiled
database in an immutable image.
During runtime only the binary database is used.</para>
During runtime, only the binary database is used.</para>
</refsect1>
<refsect1>

View File

@ -82,7 +82,7 @@
matches apply to the same field, then they are automatically
matched as alternatives, i.e. the resulting output will show
entries matching any of the specified matches for the same
field. Finally, the character <literal>+</literal> may appears
field. Finally, the character <literal>+</literal> may appear
as a separate word between other terms on the command line. This
causes all matches before and after to be combined in a
disjunction (i.e. logical OR).</para>
@ -95,7 +95,7 @@
<literal>_KERNEL_DEVICE=</literal> match for the device.</para>
<para>Additional constraints may be added using options
<option>--boot</option>, <option>--unit=</option>, etc, to
<option>--boot</option>, <option>--unit=</option>, etc., to
further limit what entries will be shown (logical AND).</para>
<para>Output is interleaved from all accessible journal files,
@ -181,7 +181,7 @@
<option>-n1000</option> to guarantee that the pager will not
buffer logs of unbounded size. This may be overridden with
an explicit <option>-n</option> with some other numeric
value while <option>-nall</option> will disable this cap.
value, while <option>-nall</option> will disable this cap.
Note that this option is only supported for the
<citerefentry project='man-pages'><refentrytitle>less</refentrytitle><manvolnum>1</manvolnum></citerefentry>
pager.</para></listitem>
@ -368,7 +368,9 @@
<term><option>-q</option></term>
<term><option>--quiet</option></term>
<listitem><para>Suppresses any warning messages regarding
<listitem><para>Suppresses all info messages
(i.e. "-- Logs begin at ...", "-- Reboot --"),
any warning messages regarding
inaccessible system journals when run as a normal
user.</para></listitem>
</varlistentry>
@ -393,7 +395,7 @@
<para>If the boot ID is omitted, a positive
<replaceable>offset</replaceable> will look up the boots
starting from the beginning of the journal, and a
starting from the beginning of the journal, and an
equal-or-less-than zero <replaceable>offset</replaceable> will
look up boots starting from the end of the journal. Thus,
<constant>1</constant> means the first boot found in the
@ -411,7 +413,7 @@
<replaceable>offset</replaceable> which identifies the boot
relative to the one given by boot
<replaceable>ID</replaceable>. Negative values mean earlier
boots and a positive values mean later boots. If
boots and positive values mean later boots. If
<replaceable>offset</replaceable> is not specified, a value of
zero is assumed, and the logs for the boot given by
<replaceable>ID</replaceable> are shown.</para>
@ -518,7 +520,7 @@
<listitem><para>Start showing entries from the location in the
journal <emphasis>after</emphasis> the location specified by
the this cursor. The cursor is shown when the
the passed cursor. The cursor is shown when the
<option>--show-cursor</option> option is used.</para>
</listitem>
</varlistentry>
@ -534,7 +536,9 @@
</varlistentry>
<varlistentry>
<term><option>-S</option></term>
<term><option>--since=</option></term>
<term><option>-U</option></term>
<term><option>--until=</option></term>
<listitem><para>Start showing entries on or newer than the
@ -552,7 +556,10 @@
respectively. <literal>now</literal> refers to the current
time. Finally, relative times may be specified, prefixed with
<literal>-</literal> or <literal>+</literal>, referring to
times before or after the current time, respectively.</para>
times before or after the current time, respectively. For complete
time and date specification, see
<citerefentry><refentrytitle>systemd.time</refentrytitle><manvolnum>7</manvolnum></citerefentry>.
</para>
</listitem>
</varlistentry>
@ -652,18 +659,18 @@
<listitem><para>Removes archived journal files until the disk
space they use falls below the specified size (specified with
the usual <literal>K</literal>, <literal>M</literal>,
<literal>G</literal>, <literal>T</literal> suffixes), or all
<literal>G</literal> and <literal>T</literal> suffixes), or all
journal files contain no data older than the specified
timespan (specified with the usual <literal>s</literal>,
<literal>min</literal>, <literal>h</literal>,
<literal>days</literal>, <literal>months</literal>,
<literal>weeks</literal>, <literal>years</literal> suffixes),
<literal>weeks</literal> and <literal>years</literal> suffixes),
or no more than the specified number of separate journal files
remain. Note that running <option>--vacuum-size=</option> has
only indirect effect on the output shown by
<option>--disk-usage</option> as the latter includes active
journal files, while the the vacuuming operation only operates
on archived journal files. Similar,
only an indirect effect on the output shown by
<option>--disk-usage</option>, as the latter includes active
journal files, while the vacuuming operation only operates
on archived journal files. Similarly,
<option>--vacuum-files=</option> might not actually reduce the
number of journal files to below the specified number, as it
will not remove active journal
@ -765,22 +772,42 @@
the <option>--verify</option> operation.</para></listitem>
</varlistentry>
<varlistentry>
<term><option>--sync</option></term>
<listitem><para>Asks the journal daemon to write all yet
unwritten journal data to the backing file system and
synchronize all journals. This call does not return until the
synchronization operation is complete. This command guarantees
that any log messages written before its invocation are safely
stored on disk at the time it returns.</para></listitem>
</varlistentry>
<varlistentry>
<term><option>--flush</option></term>
<listitem><para>Asks the Journal daemon to flush any log data
<listitem><para>Asks the journal daemon to flush any log data
stored in <filename>/run/log/journal</filename> into
<filename>/var/log/journal</filename>, if persistent storage is
enabled. This call does not return until the operation is
complete.</para></listitem>
<filename>/var/log/journal</filename>, if persistent storage
is enabled. This call does not return until the operation is
complete. Note that this call is idempotent: the data is only
flushed from <filename>/run/log/journal</filename> into
<filename>/var/log/journal</filename> once during system
runtime, and this command exits cleanly without executing any
operation if this has already has happened. This command
effectively guarantees that all data is flushed to
<filename>/var/log/journal</filename> at the time it
returns.</para></listitem>
</varlistentry>
<varlistentry>
<term><option>--rotate</option></term>
<listitem><para>Asks the Journal daemon to rotate journal files.
</para></listitem>
<listitem><para>Asks the journal daemon to rotate journal
files. This call does not return until the rotation operation
is complete.</para></listitem>
</varlistentry>
<xi:include href="standard-options.xml" xpointer="help" />
<xi:include href="standard-options.xml" xpointer="version" />
<xi:include href="standard-options.xml" xpointer="no-pager" />
@ -850,7 +877,8 @@
<citerefentry><refentrytitle>systemctl</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
<citerefentry><refentrytitle>coredumpctl</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
<citerefentry><refentrytitle>systemd.journal-fields</refentrytitle><manvolnum>7</manvolnum></citerefentry>,
<citerefentry><refentrytitle>journald.conf</refentrytitle><manvolnum>5</manvolnum></citerefentry>
<citerefentry><refentrytitle>journald.conf</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
<citerefentry><refentrytitle>systemd.time</refentrytitle><manvolnum>7</manvolnum></citerefentry>
</para>
</refsect1>
</refentry>

View File

@ -203,7 +203,7 @@
<para><varname>SystemMaxUse=</varname> and
<varname>RuntimeMaxUse=</varname> control how much disk space
the journal may use up at maximum.
the journal may use up at most.
<varname>SystemKeepFree=</varname> and
<varname>RuntimeKeepFree=</varname> control how much disk
space systemd-journald shall leave free for other uses.
@ -220,12 +220,12 @@
enough free space before and journal files were created, and
subsequently something else causes the file system to fill up,
journald will stop using more space, but it will not be
removing existing files to reduce footprint again
removing existing files to reduce the footprint again,
either.</para>
<para><varname>SystemMaxFileSize=</varname> and
<varname>RuntimeMaxFileSize=</varname> control how large
individual journal files may grow at maximum. This influences
individual journal files may grow at most. This influences
the granularity in which disk space is made available through
rotation, i.e. deletion of historic data. Defaults to one
eighth of the values configured with
@ -234,17 +234,17 @@
rotated journal files are kept as history.</para>
<para>Specify values in bytes or use K, M, G, T, P, E as
units for the specified sizes (equal to 1024, 1024²,... bytes).
units for the specified sizes (equal to 1024, 1024², ... bytes).
Note that size limits are enforced synchronously when journal
files are extended, and no explicit rotation step triggered by
time is needed.</para>
<para><varname>SystemMaxFiles=</varname> and
<varname>RuntimeMaxFiles=</varname> control how many
individual journal files to keep at maximum. Note that only
individual journal files to keep at most. Note that only
archived files are deleted to reduce the number of files until
this limit is reached; active files will stay around. This
means that in effect there might still be more journal files
means that, in effect, there might still be more journal files
around in total than this limit after a vacuuming operation is
complete. This setting defaults to 100.</para></listitem>
</varlistentry>
@ -345,7 +345,7 @@
<literal>notice</literal>,
<literal>info</literal>,
<literal>debug</literal>,
or integer values in the range of 0..7 (corresponding to the
or integer values in the range of 07 (corresponding to the
same levels). Messages equal or below the log level specified
are stored/forwarded, messages above are dropped. Defaults to
<literal>debug</literal> for <varname>MaxLevelStore=</varname>
@ -375,15 +375,15 @@
<para>
Journal events can be transferred to a different logging daemon
in two different ways. In the first method, messages are
in two different ways. With the first method, messages are
immediately forwarded to a socket
(<filename>/run/systemd/journal/syslog</filename>), where the
traditional syslog daemon can read them. This method is
controlled by <varname>ForwardToSyslog=</varname> option. In a
controlled by the <varname>ForwardToSyslog=</varname> option. With a
second method, a syslog daemon behaves like a normal journal
client, and reads messages from the journal files, similarly to
<citerefentry><refentrytitle>journalctl</refentrytitle><manvolnum>1</manvolnum></citerefentry>.
In this method, messages do not have to be read immediately,
With this, messages do not have to be read immediately,
which allows a logging daemon which is only started late in boot
to access all messages since the start of the system. In
addition, full structured meta-data is available to it. This

View File

@ -66,7 +66,7 @@
<para>For command line parameters understood by the initial RAM
disk, please see
<citerefentry project='die-net'><refentrytitle>dracut.cmdline</refentrytitle><manvolnum>7</manvolnum></citerefentry>,
<citerefentry project='man-pages'><refentrytitle>dracut.cmdline</refentrytitle><manvolnum>7</manvolnum></citerefentry>,
or the documentation of the specific initrd implementation of your
installation.</para>
</refsect1>
@ -118,7 +118,7 @@
from the previous boot. For details, see
<citerefentry><refentrytitle>systemd-backlight@.service</refentrytitle><manvolnum>8</manvolnum></citerefentry>
and
<citerefentry><refentrytitle>systemd-rfkill@.service</refentrytitle><manvolnum>8</manvolnum></citerefentry>.
<citerefentry><refentrytitle>systemd-rfkill.service</refentrytitle><manvolnum>8</manvolnum></citerefentry>.
</para>
</listitem>
</varlistentry>
@ -351,7 +351,7 @@
<para>
<citerefentry><refentrytitle>systemd</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
<citerefentry project='man-pages'><refentrytitle>bootparam</refentrytitle><manvolnum>7</manvolnum></citerefentry>,
<citerefentry project='die-net'><refentrytitle>dracut.cmdline</refentrytitle><manvolnum>7</manvolnum></citerefentry>,
<citerefentry project='man-pages'><refentrytitle>dracut.cmdline</refentrytitle><manvolnum>7</manvolnum></citerefentry>,
<citerefentry><refentrytitle>systemd-debug-generator</refentrytitle><manvolnum>8</manvolnum></citerefentry>,
<citerefentry><refentrytitle>systemd-fsck@.service</refentrytitle><manvolnum>8</manvolnum></citerefentry>,
<citerefentry><refentrytitle>systemd-quotacheck.service</refentrytitle><manvolnum>8</manvolnum></citerefentry>,
@ -364,7 +364,7 @@
<citerefentry><refentrytitle>systemd-gpt-auto-generator</refentrytitle><manvolnum>8</manvolnum></citerefentry>,
<citerefentry><refentrytitle>systemd-modules-load.service</refentrytitle><manvolnum>8</manvolnum></citerefentry>,
<citerefentry><refentrytitle>systemd-backlight@.service</refentrytitle><manvolnum>8</manvolnum></citerefentry>,
<citerefentry><refentrytitle>systemd-rfkill@.service</refentrytitle><manvolnum>8</manvolnum></citerefentry>,
<citerefentry><refentrytitle>systemd-rfkill.service</refentrytitle><manvolnum>8</manvolnum></citerefentry>,
<citerefentry><refentrytitle>systemd-hibernate-resume-generator</refentrytitle><manvolnum>8</manvolnum></citerefentry>
</para>
</refsect1>

View File

@ -75,7 +75,7 @@
a udev context. Furthermore, multiple different udev contexts can
be used in parallel by multiple threads. However, a single context
must not be accessed by multiple threads in parallel. The caller
is responsible of providing suitable locking if they intend to use
is responsible for providing suitable locking if they intend to use
it from multiple threads.</para>
<para>To introspect a local device on a system, a udev device
@ -99,11 +99,11 @@
<para>Furthermore, libudev also exports legacy APIs that should
not be used by new software (and as such are not documented as
part of this manual). This includes the hardware-database known
part of this manual). This includes the hardware database known
as <constant>udev_hwdb</constant> (please use the new
<citerefentry><refentrytitle>sd-hwdb</refentrytitle><manvolnum>3</manvolnum></citerefentry>
API instead) and the <constant>udev_queue</constant> object to
query the udev-daemon (which should not be used by new software
query the udev daemon (which should not be used by new software
at all).</para>
</refsect1>

View File

@ -54,7 +54,7 @@
<title>Description</title>
<para>The <filename>/etc/locale.conf</filename> file configures
system-wide locale settings. It is read at early-boot by
system-wide locale settings. It is read at early boot by
<citerefentry><refentrytitle>systemd</refentrytitle><manvolnum>1</manvolnum></citerefentry>.</para>
<para>The basic file format of <filename>locale.conf</filename> is

View File

@ -186,7 +186,7 @@
<listitem><para>Show terse runtime status information about
one or more sessions, followed by the most recent log data
from the journal. Takes one or more session identifiers as
parameters. If no session identifiers are passed the status of
parameters. If no session identifiers are passed, the status of
the caller's session is shown. This function is intended to
generate human-readable output. If you are looking for
computer-parsable output, use <command>show-session</command>
@ -212,9 +212,9 @@
<term><command>activate</command> <optional><replaceable>ID</replaceable></optional></term>
<listitem><para>Activate a session. This brings a session into
the foreground, if another session is currently in the
the foreground if another session is currently in the
foreground on the respective seat. Takes a session identifier
as argument. If no argument is specified the session of the
as argument. If no argument is specified, the session of the
caller is put into foreground.</para></listitem>
</varlistentry>
@ -225,7 +225,7 @@
<listitem><para>Activates/deactivates the screen lock on one
or more sessions, if the session supports it. Takes one or
more session identifiers as arguments. If no argument is
specified the session of the caller is locked/unlocked.
specified, the session of the caller is locked/unlocked.
</para></listitem>
</varlistentry>
@ -269,7 +269,7 @@
<listitem><para>Show terse runtime status information about
one or more logged in users, followed by the most recent log
data from the journal. Takes one or more user names or numeric
user IDs as parameters. If no parameters are passed the status
user IDs as parameters. If no parameters are passed, the status
of the caller's user is shown. This function is intended to
generate human-readable output. If you are looking for
computer-parsable output, use <command>show-user</command>
@ -301,7 +301,7 @@
spawned for the user at boot and kept around after logouts.
This allows users who are not logged in to run long-running
services. Takes one or more user names or numeric UIDs as
argument. If no argument is specified enables/disables
argument. If no argument is specified, enables/disables
lingering for the user of the session of the caller.
</para></listitem>
</varlistentry>
@ -365,7 +365,7 @@
seat. The devices should be specified via device paths in the
<filename>/sys</filename> file system. To create a new seat,
attach at least one graphics card to a previously unused seat
name. Seat names may consist only of a-z, A-Z, 0-9,
name. Seat names may consist only of az, AZ, 09,
<literal>-</literal> and <literal>_</literal> and must be
prefixed with <literal>seat</literal>. To drop assignment of a
device to a specific seat, just reassign it to a different

View File

@ -1,4 +1,4 @@
<?xml version='1.0'?> <!--*-nxml-*-->
<?xml version='1.0'?> <!--*- Mode: nxml; nxml-child-indent: 2; indent-tabs-mode: nil -*-->
<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
@ -255,8 +255,8 @@
<listitem><para>Specifies the timeout after system startup or
system resume in which systemd will hold off on reacting to
LID events. This is required for the system to properly
detect any hotplugged devices so systemd can ignore LID events
lid events. This is required for the system to properly
detect any hotplugged devices so systemd can ignore lid events
if external monitors, or docks, are connected. If set to 0,
systemd will always react immediately, possibly before the
kernel fully probed all hotplugged devices. This is safe, as
@ -277,7 +277,18 @@
limit relative to the amount of physical RAM. Defaults to 10%.
Note that this size is a safety limit only. As each runtime
directory is a tmpfs file system, it will only consume as much
memory as is needed. </para></listitem>
memory as is needed.</para></listitem>
</varlistentry>
<varlistentry>
<term><varname>UserTasksMax=</varname></term>
<listitem><para>Sets the maximum number of OS tasks each user
may run concurrently. This controls the
<varname>TasksMax=</varname> setting of the per-user slice
unit, see
<citerefentry><refentrytitle>systemd.resource-control</refentrytitle><manvolnum>5</manvolnum></citerefentry>
for details. Defaults to 4096.</para></listitem>
</varlistentry>
<varlistentry>

View File

@ -124,7 +124,7 @@
<literal>tablet</literal>,
<literal>handset</literal>,
<literal>watch</literal>, and
<literal>embedded</literal>
<literal>embedded</literal>,
as well as the special chassis types
<literal>vm</literal> and
<literal>container</literal> for

View File

@ -83,9 +83,9 @@
</itemizedlist>
<para>Machines are identified by names that follow the same rules
as UNIX and DNS host names, for details see below. Machines are
instantiated from disk or file system images, that frequently but not
necessarily carry the same name as machines running from
as UNIX and DNS host names, for details, see below. Machines are
instantiated from disk or file system images that frequently — but not
necessarily — carry the same name as machines running from
them. Images in this sense are considered:</para>
<itemizedlist>
@ -201,7 +201,7 @@
<varlistentry>
<term><option>--mkdir</option></term>
<listitem><para>When used with <command>bind</command> creates
<listitem><para>When used with <command>bind</command>, creates
the destination directory before applying the bind
mount.</para></listitem>
</varlistentry>
@ -209,7 +209,7 @@
<varlistentry>
<term><option>--read-only</option></term>
<listitem><para>When used with <command>bind</command> applies
<listitem><para>When used with <command>bind</command>, applies
a read-only bind mount.</para></listitem>
</varlistentry>
@ -243,9 +243,9 @@
specify whether the image shall be verified before it is made
available. Takes one of <literal>no</literal>,
<literal>checksum</literal> and <literal>signature</literal>.
If <literal>no</literal> no verification is done. If
<literal>checksum</literal> is specified the download is
checked for integrity after transfer is complete, but no
If <literal>no</literal>, no verification is done. If
<literal>checksum</literal> is specified, the download is
checked for integrity after the transfer is complete, but no
signatures are verified. If <literal>signature</literal> is
specified, the checksum is verified and the images's signature
is checked against a local keyring of trustable vendors. It is
@ -278,10 +278,10 @@
<term><option>--format=</option></term>
<listitem><para>When used with the <option>export-tar</option>
or <option>export-raw</option> commands specifies the
or <option>export-raw</option> commands, specifies the
compression format to use for the resulting file. Takes one of
<literal>uncompressed</literal>, <literal>xz</literal>,
<literal>gzip</literal>, <literal>bzip2</literal>. By default
<literal>gzip</literal>, <literal>bzip2</literal>. By default,
the format is determined automatically from the image file
name passed.</para></listitem>
</varlistentry>
@ -317,7 +317,7 @@
<varlistentry>
<term><command>status</command> <replaceable>NAME</replaceable>...</term>
<listitem><para>Show terse runtime status information about
<listitem><para>Show runtime status information about
one or more virtual machines and containers, followed by the
most recent log data from the journal. This function is
intended to generate human-readable output. If you are looking
@ -339,7 +339,8 @@
are suppressed. Use <option>--all</option> to show those too.
To select specific properties to show, use
<option>--property=</option>. This command is intended to be
used whenever computer-parsable output is required. Use
used whenever computer-parsable output is required, and does
not print the cgroup tree or journal entries. Use
<command>status</command> if you are looking for formatted
human-readable output.</para></listitem>
</varlistentry>
@ -356,7 +357,7 @@
image by the specified name in
<filename>/var/lib/machines/</filename> (and other search
paths, see below) and runs it. Use
<command>list-images</command> (see below), for listing
<command>list-images</command> (see below) for listing
available container images to start.</para>
<para>Note that
@ -381,7 +382,7 @@
<term><command>login</command> [<replaceable>NAME</replaceable>]</term>
<listitem><para>Open an interactive terminal login session in
a container or on the local host. If an argument is supplied
a container or on the local host. If an argument is supplied,
it refers to the container machine to connect to. If none is
specified, or the container name is specified as the empty
string, or the special machine name <literal>.host</literal>
@ -414,7 +415,7 @@
instead. This works similar to <command>login</command> but
immediately invokes a user process. This command runs the
specified executable with the specified arguments, or
<filename>/bin/sh</filename> if none is specified. By default
<filename>/bin/sh</filename> if none is specified. By default,
opens a <literal>root</literal> shell, but by using
<option>--uid=</option>, or by prefixing the machine name with
a username and an <literal>@</literal> character, a different
@ -422,10 +423,10 @@
environment variables for the executed process.</para>
<para>When using the <command>shell</command> command without
arguments (thus invoking the executed shell or command on the
local host) it is similar in many ways to a <citerefentry
arguments, (thus invoking the executed shell or command on the
local host), it is in many ways similar to a <citerefentry
project='die-net'><refentrytitle>su</refentrytitle><manvolnum>1</manvolnum></citerefentry>
session, but unlike <command>su</command> completely isolates
session, but, unlike <command>su</command>, completely isolates
the new session from the originating session, so that it
shares no process or session properties, and is in a clean and
well-defined state. It will be tracked in a new utmp, login,
@ -433,7 +434,7 @@
environment variables or resource limits, among other
properties.</para>
<para>Note that the
<para>Note that
<citerefentry><refentrytitle>systemd-run</refentrytitle><manvolnum>1</manvolnum></citerefentry>
may be used in place of the <command>shell</command> command,
and allows more detailed, low-level configuration of the
@ -509,11 +510,11 @@
specified container. The first directory argument is the
source directory on the host, the second directory argument
is the destination directory in the container. When the
latter is omitted the destination path in the container is
latter is omitted, the destination path in the container is
the same as the source path on the host. When combined with
the <option>--read-only</option> switch a ready-only bind
the <option>--read-only</option> switch, a ready-only bind
mount is created. When combined with the
<option>--mkdir</option> switch the destination path is first
<option>--mkdir</option> switch, the destination path is first
created before the mount is applied. Note that this option is
currently only supported for
<citerefentry><refentrytitle>systemd-nspawn</refentrytitle><manvolnum>1</manvolnum></citerefentry>
@ -526,7 +527,7 @@
<listitem><para>Copies files or directories from the host
system into a running container. Takes a container name,
followed by the source path on the host and the destination
path in the container. If the destination path is omitted the
path in the container. If the destination path is omitted, the
same as the source path is used.</para></listitem>
</varlistentry>
@ -537,7 +538,7 @@
<listitem><para>Copies files or directories from a container
into the host system. Takes a container name, followed by the
source path in the container the destination path on the host.
If the destination path is omitted the same as the source path
If the destination path is omitted, the same as the source path
is used.</para></listitem>
</varlistentry>
</variablelist></refsect2>
@ -552,8 +553,8 @@
directories and subvolumes in
<filename>/var/lib/machines/</filename> (and other search
paths, see below). Use <command>start</command> (see above) to
run a container off one of the listed images. Note that by
default containers whose name begins with a dot
run a container off one of the listed images. Note that, by
default, containers whose name begins with a dot
(<literal>.</literal>) are not shown. To show these too,
specify <option>--all</option>. Note that a special image
<literal>.host</literal> always implicitly exists and refers
@ -626,27 +627,27 @@
<listitem><para>Removes one or more container or VM images.
The special image <literal>.host</literal>, which refers to
the host's own directory tree may not be
the host's own directory tree, may not be
removed.</para></listitem>
</varlistentry>
<varlistentry>
<term><command>set-limit</command> [<replaceable>NAME</replaceable>] <replaceable>BYTES</replaceable></term>
<listitem><para>Sets the maximum size in bytes a specific
container or VM image, or all images may grow up to on disk
<listitem><para>Sets the maximum size in bytes that a specific
container or VM image, or all images, may grow up to on disk
(disk quota). Takes either one or two parameters. The first,
optional parameter refers to a container or VM image name. If
specified the size limit of the specified image is changed. If
omitted the overall size limit of the sum of all images stored
specified, the size limit of the specified image is changed. If
omitted, the overall size limit of the sum of all images stored
locally is changed. The final argument specifies the size
limit in bytes, possibly suffixed by the usual K, M, G, T
units. If the size limit shall be disabled, specify
<literal>-</literal> as size.</para>
<para>Note that per-container size limits are only supported
on btrfs file systems. Also note that if
<command>set-limit</command> is invoked without image
on btrfs file systems. Also note that, if
<command>set-limit</command> is invoked without an image
parameter, and <filename>/var/lib/machines</filename> is
empty, and the directory is not located on btrfs, a btrfs
loopback file is implicitly created as
@ -656,7 +657,7 @@
loopback may later be readjusted with
<command>set-limit</command>, as well. If such a
loopback-mounted <filename>/var/lib/machines</filename>
directory is used <command>set-limit</command> without image
directory is used, <command>set-limit</command> without an image
name alters both the quota setting within the file system as
well as the loopback file and file system size
itself.</para></listitem>
@ -676,20 +677,20 @@
<literal>https://</literal>, and must refer to a
<filename>.tar</filename>, <filename>.tar.gz</filename>,
<filename>.tar.xz</filename> or <filename>.tar.bz2</filename>
archive file. If the local machine name is omitted it
archive file. If the local machine name is omitted, it
is automatically derived from the last component of the URL,
with its suffix removed.</para>
<para>The image is verified before it is made available,
unless <option>--verify=no</option> is specified. Verification
is done via SHA256SUMS and SHA256SUMS.gpg files, that need to
is done via SHA256SUMS and SHA256SUMS.gpg files that need to
be made available on the same web server, under the same URL
as the <filename>.tar</filename> file, but with the last
component (the filename) of the URL replaced. With
<option>--verify=checksum</option> only the SHA256 checksum
<option>--verify=checksum</option>, only the SHA256 checksum
for the file is verified, based on the
<filename>SHA256SUMS</filename> file. With
<option>--verify=signature</option> the SHA256SUMS file is
<option>--verify=signature</option>, the SHA256SUMS file is
first verified with detached GPG signature file
<filename>SHA256SUMS.gpg</filename>. The public key for this
verification step needs to be available in
@ -698,7 +699,7 @@
<para>The container image will be downloaded and stored in a
read-only subvolume in
<filename>/var/lib/machines/</filename>, that is named after
<filename>/var/lib/machines/</filename> that is named after
the specified URL and its HTTP etag. A writable snapshot is
then taken from this subvolume, and named after the specified
local name. This behavior ensures that creating multiple
@ -729,7 +730,7 @@
be a <filename>.qcow2</filename> or raw disk image, optionally
compressed as <filename>.gz</filename>,
<filename>.xz</filename>, or <filename>.bz2</filename>. If the
local machine name is omitted it is automatically
local machine name is omitted, it is automatically
derived from the last component of the URL, with its suffix
removed.</para>
@ -801,22 +802,22 @@
<listitem><para>Imports a TAR or RAW container or VM image,
and places it under the specified name in
<filename>/var/lib/machines/</filename>. When
<command>import-tar</command> is used the file specified as
first argument should be a tar archive, possibly compressed
<command>import-tar</command> is used, the file specified as
the first argument should be a tar archive, possibly compressed
with xz, gzip or bzip2. It will then be unpacked into its own
subvolume in <filename>/var/lib/machines</filename>. When
<command>import-raw</command> is used the file should be a
<command>import-raw</command> is used, the file should be a
qcow2 or raw disk image, possibly compressed with xz, gzip or
bzip2. If the second argument (the resulting image name) is
not specified it is automatically derived from the file
name. If the file name is passed as <literal>-</literal> the
not specified, it is automatically derived from the file
name. If the file name is passed as <literal>-</literal>, the
image is read from standard input, in which case the second
argument is mandatory.</para>
<para>Similar as with <command>pull-tar</command>,
<command>pull-raw</command> the file system
<filename>/var/lib/machines.raw</filename> is increased in
size of necessary and appropriate. Optionally the
size of necessary and appropriate. Optionally, the
<option>--read-only</option> switch may be used to create a
read-only container or VM image. No cryptographic validation
is done when importing the images.</para>
@ -833,11 +834,11 @@
stores it in the specified file. The first parameter should be
a VM or container image name. The second parameter should be a
file path the TAR or RAW image is written to. If the path ends
in <literal>.gz</literal> the file is compressed with gzip, if
it ends in <literal>.xz</literal> with xz, and if it ends in
<literal>.bz2</literal> with bzip2. If the path ends in
neither the file is left uncompressed. If the second argument
is missing the image is written to standard output. The
in <literal>.gz</literal>, the file is compressed with gzip, if
it ends in <literal>.xz</literal>, with xz, and if it ends in
<literal>.bz2</literal>, with bzip2. If the path ends in
neither, the file is left uncompressed. If the second argument
is missing, the image is written to standard output. The
compression may also be explicitly selected with the
<option>--format=</option> switch. This is in particular
useful if the second parameter is left unspecified.</para>
@ -847,7 +848,7 @@
aborted with
<command>cancel-transfer</command>.</para>
<para>Note that currently only directory and subvolume images
<para>Note that, currently, only directory and subvolume images
may be exported as TAR images, and only raw disk images as RAW
images.</para></listitem>
</varlistentry>
@ -877,34 +878,34 @@
<title>Machine and Image Names</title>
<para>The <command>machinectl</command> tool operates on machines
and images, whose names must be chosen following strict
and images whose names must be chosen following strict
rules. Machine names must be suitable for use as host names
following a conservative subset of DNS and UNIX/Linux
semantics. Specifically, they must consist of one or more
non-empty label strings, separated by dots. No leading or trailing
dots are allowed. No sequences of multiple dots are allowed. The
label strings may only consists of alphanumeric characters as well
label strings may only consist of alphanumeric characters as well
as the dash and underscore. The maximum length of a machine name
is 64 characters.</para>
<para>A special machine with the name <literal>.host</literal>
refers to the running host system itself. This is useful for execution
operations or inspecting the host system as well. Not that
operations or inspecting the host system as well. Note that
<command>machinectl list</command> will not show this special
machine unless the <option>--all</option> switch is specified.</para>
<para>Requirements on image names are less strict, however must be
<para>Requirements on image names are less strict, however, they must be
valid UTF-8, must be suitable as file names (hence not be the
single or double dot, and not include a slash), and may not
contain control characters. Since many operations search for an
image by the name of a requested machine it is recommended to name
image by the name of a requested machine, it is recommended to name
images in the same strict fashion as machines.</para>
<para>A special image with the name <literal>.host</literal>
refers to the image of the running host system. It is hence
refers to the image of the running host system. It hence
conceptually maps to the special <literal>.host</literal> machine
name described above. Note that <command>machinectl
list-images</command> won't show this special image either, unless
list-images</command> will not show this special image either, unless
<option>--all</option> is specified.</para>
</refsect1>
@ -914,7 +915,7 @@
<para>Machine images are preferably stored in
<filename>/var/lib/machines/</filename>, but are also searched for
in <filename>/usr/local/lib/machines/</filename> and
<filename>/usr/lib/machines/</filename>. For compatibility reasons
<filename>/usr/lib/machines/</filename>. For compatibility reasons,
the directory <filename>/var/lib/container/</filename> is
searched, too. Note that images stored below
<filename>/usr</filename> are always considered read-only. It is
@ -943,7 +944,7 @@
<listitem><para>A simple directory tree, containing the files
and directories of the container to boot.</para></listitem>
<listitem><para>A subvolume (on btrfs file systems), which are
<listitem><para>Subvolumes (on btrfs file systems), which are
similar to the simple directories, described above. However,
they have additional benefits, such as efficient cloning and
quota reporting.</para></listitem>
@ -956,7 +957,7 @@
<para>See
<citerefentry><refentrytitle>systemd-nspawn</refentrytitle><manvolnum>1</manvolnum></citerefentry>
for more information on image formats, in particular it's
for more information on image formats, in particular its
<option>--directory=</option> and <option>--image=</option>
options.</para>
</refsect1>
@ -987,7 +988,7 @@
# machinectl login Fedora-Cloud-Base-20141203-21</programlisting>
<para>This downloads the specified <filename>.raw</filename>
image with verification disabled. Then a shell is opened in it
image with verification disabled. Then, a shell is opened in it
and a root password is set. Afterwards the shell is left, and
the machine started as system service. With the last command a
login prompt into the container is requested.</para>
@ -1010,8 +1011,8 @@
<programlisting># machinectl export-tar fedora myfedora.tar.xz</programlisting>
<para>Exports the container <literal>fedora</literal> in an
xz-compress tar file <filename>myfedora.tar.xz</filename> in the
<para>Exports the container <literal>fedora</literal> as an
xz-compressed tar file <filename>myfedora.tar.xz</filename> into the
current directory.</para>
</example>
@ -1020,7 +1021,7 @@
<programlisting># machinectl shell --uid=lennart</programlisting>
<para>This creates a new shell session on the local host, for
<para>This creates a new shell session on the local host for
the user ID <literal>lennart</literal>, in a <citerefentry
project='die-net'><refentrytitle>su</refentrytitle><manvolnum>1</manvolnum></citerefentry>-like
fashion.</para>

View File

@ -129,7 +129,7 @@ IDX LINK TYPE OPERATIONAL SETUP
configured DNS servers, etc.</para>
<para>When no links are specified, routable links are
shown. See also option <option>--all</option>.</para>
shown. Also see the option <option>--all</option>.</para>
<para>Produces output similar to
<programlisting>

View File

@ -59,7 +59,7 @@
<para><command>nss-myhostname</command> is a plugin for the GNU
Name Service Switch (NSS) functionality of the GNU C Library
(<command>glibc</command>) primarily providing hostname resolution
(<command>glibc</command>), primarily providing hostname resolution
for the locally configured system hostname as returned by
<citerefentry><refentrytitle>gethostname</refentrytitle><manvolnum>2</manvolnum></citerefentry>.
The precise hostnames resolved by this module are:</para>
@ -89,9 +89,9 @@
time as changing the hostname. This is problematic since it
requires a writable <filename>/etc</filename> file system and is
fragile because the file might be edited by the administrator at
the same time. With <command>nss-myhostname</command> enabled
the same time. With <command>nss-myhostname</command> enabled,
changing <filename>/etc/hosts</filename> is unnecessary, and on
many systems the file becomes entirely optional.</para>
many systems, the file becomes entirely optional.</para>
<para>To activate the NSS modules, <literal>myhostname</literal>
has to be added to the line starting with
@ -100,7 +100,7 @@
<para>It is recommended to place <literal>myhostname</literal>
last in the <filename>nsswitch.conf</filename> line to make sure
that this mapping is only used as fallback, and any DNS or
that this mapping is only used as fallback, and that any DNS or
<filename>/etc/hosts</filename> based mapping takes
precedence.</para>
</refsect1>
@ -108,8 +108,8 @@
<refsect1>
<title>Example</title>
<para>Here's an example <filename>/etc/nsswitch.conf</filename>
file, that enables <command>myhostname</command> correctly:</para>
<para>Here is an example <filename>/etc/nsswitch.conf</filename>
file that enables <command>myhostname</command> correctly:</para>
<programlisting>passwd: compat mymachines
group: compat mymachines
@ -135,7 +135,7 @@ netgroup: nis</programlisting>
127.0.0.2 DGRAM
127.0.0.2 RAW</programlisting>
<para>In this case the local hostname is <varname>omega</varname>.</para>
<para>In this case, the local hostname is <varname>omega</varname>.</para>
</refsect1>

View File

@ -58,8 +58,8 @@
<para><command>nss-mymachines</command> is a plugin for the GNU
Name Service Switch (NSS) functionality of the GNU C Library
(<command>glibc</command>) providing hostname resolution for
container names of containers running locally, that are registered
(<command>glibc</command>), providing hostname resolution for
container names of containers running locally that are registered
with
<citerefentry><refentrytitle>systemd-machined.service</refentrytitle><manvolnum>8</manvolnum></citerefentry>.
The container names are resolved to the IP addresses of the
@ -76,16 +76,16 @@
<para>It is recommended to place <literal>mymachines</literal>
near the end of the <filename>nsswitch.conf</filename> lines to
make sure that its mappings are only used as fallback, and any
make sure that its mappings are only used as fallback, and that any
other mappings, such as DNS or <filename>/etc/hosts</filename>
based mappings take precedence.</para>
based mappings, take precedence.</para>
</refsect1>
<refsect1>
<title>Example</title>
<para>Here's an example <filename>/etc/nsswitch.conf</filename>
file, that enables <command>mymachines</command> correctly:</para>
<para>Here is an example <filename>/etc/nsswitch.conf</filename>
file that enables <command>mymachines</command> correctly:</para>
<programlisting>passwd: compat <command>mymachines</command>
group: compat <command>mymachines</command>

View File

@ -79,8 +79,8 @@
<refsect1>
<title>Example</title>
<para>Here's an example <filename>/etc/nsswitch.conf</filename>
file, that enables <command>resolve</command> correctly:</para>
<para>Here is an example <filename>/etc/nsswitch.conf</filename>
file that enables <command>resolve</command> correctly:</para>
<programlisting>passwd: compat mymachines
group: compat mymachines

View File

@ -67,7 +67,7 @@
without implementing a shell compatible execution engine. Variable
assignment values must be enclosed in double or single quotes if
they include spaces, semicolons or other special characters
outside of A-Z, a-z, 0-9. Shell special characters ("$", quotes,
outside of AZ, az, 09. Shell special characters ("$", quotes,
backslash, backtick) must be escaped with backslashes, following
shell style. All strings should be in UTF-8 format, and
non-printable characters should not be used. It is not supported
@ -141,7 +141,7 @@
<term><varname>ID=</varname></term>
<listitem><para>A lower-case string (no spaces or other
characters outside of 0-9, a-z, ".", "_" and "-") identifying
characters outside of 09, az, ".", "_" and "-") identifying
the operating system, excluding any version information and
suitable for processing by scripts or usage in generated
filenames. If not set, defaults to
@ -179,7 +179,7 @@
<term><varname>VERSION_ID=</varname></term>
<listitem><para>A lower-case string (mostly numeric, no spaces
or other characters outside of 0-9, a-z, ".", "_" and "-")
or other characters outside of 09, az, ".", "_" and "-")
identifying the operating system version, excluding any OS
name information or release code name, and suitable for
processing by scripts or usage in generated filenames. This
@ -298,7 +298,7 @@
<listitem><para>
A lower-case string (no spaces or other characters outside of
0-9, a-z, ".", "_" and "-"), identifying a specific variant or
09, az, ".", "_" and "-"), identifying a specific variant or
edition of the operating system. This may be interpreted by
other packages in order to determine a divergent default
configuration. This field is optional and may not be

View File

@ -197,7 +197,7 @@
as <constant>AF_UNIX</constant> sockets, FIFOs, PID files and
similar. It is guaranteed that this directory is local and
offers the greatest possible file system feature set the
operating system provides. For further details see the <ulink
operating system provides. For further details, see the <ulink
url="http://standards.freedesktop.org/basedir-spec/basedir-spec-latest.html">XDG
Base Directory Specification</ulink>.</para></listitem>
</varlistentry>

View File

@ -59,7 +59,7 @@
<title>Description</title>
<para>These configuration files control local DNS and LLMNR
name resolving.</para>
name resolution.</para>
</refsect1>
@ -72,12 +72,12 @@
<varlistentry>
<term><varname>DNS=</varname></term>
<listitem><para>A space separated list of IPv4 and IPv6
<listitem><para>A space-separated list of IPv4 and IPv6
addresses to be used as system DNS servers. DNS requests are
sent to one of the listed DNS servers in parallel to any
per-interface DNS servers acquired from
<citerefentry><refentrytitle>systemd-networkd.service</refentrytitle><manvolnum>8</manvolnum></citerefentry>.
For compatibility reasons, if set to the empty list the DNS
For compatibility reasons, if set to the empty list, the DNS
servers listed in <filename>/etc/resolv.conf</filename> are
used, if any are configured there. This setting defaults to
the empty list.</para></listitem>
@ -85,7 +85,7 @@
<varlistentry>
<term><varname>FallbackDNS=</varname></term>
<listitem><para>A space separated list of IPv4 and IPv6
<listitem><para>A space-separated list of IPv4 and IPv6
addresses to be used as the fallback DNS servers. Any
per-interface DNS servers obtained from
<citerefentry><refentrytitle>systemd-networkd.service</refentrytitle><manvolnum>8</manvolnum></citerefentry>
@ -103,9 +103,9 @@
<literal>resolve</literal>. Controls Link-Local Multicast Name
Resolution support (<ulink
url="https://tools.ietf.org/html/rfc4795">RFC 4794</ulink>) on
the local host. If true enables full LLMNR responder and
resolver support. If false disable both. If set to
<literal>resolve</literal> only resolving support is enabled,
the local host. If true, enables full LLMNR responder and
resolver support. If false, disables both. If set to
<literal>resolve</literal>, only resolution support is enabled,
but responding is disabled. Note that
<citerefentry><refentrytitle>systemd-networkd.service</refentrytitle><manvolnum>8</manvolnum></citerefentry>
also maintains per-interface LLMNR settings. LLMNR will be

View File

@ -51,10 +51,61 @@
<refsynopsisdiv>
<cmdsynopsis>
<command>runlevel <arg choice="opt" rep="repeat">options</arg></command>
<command>runlevel</command>
<arg choice="opt" rep="repeat">options</arg>
</cmdsynopsis>
</refsynopsisdiv>
<refsect1>
<title>Overview</title>
<para>"Runlevels" are an obsolete way to start and stop groups of
services used in SysV init. systemd provides a compatibility layer
that maps runlevels to targets, and associated binaries like
<command>runlevel</command>. Nevertheless, only one runlevel can
be "active" at a given time, while systemd can activate multiple
targets concurrently, so the mapping to runlevels is confusing
and only approximate. Runlevels should not be used in new code,
and are mostly useful as a shorthand way to refer the matching
systemd targets in kernel boot parameters.</para>
<table>
<title>Mapping between runlevels and systemd targets</title>
<tgroup cols='2' align='left' colsep='1' rowsep='1'>
<colspec colname="runlevel" />
<colspec colname="target" />
<thead>
<row>
<entry>Runlevel</entry>
<entry>Target</entry>
</row>
</thead>
<tbody>
<row>
<entry>0</entry>
<entry><filename>poweroff.target</filename></entry>
</row>
<row>
<entry>1</entry>
<entry><filename>rescue.target</filename></entry>
</row>
<row>
<entry>2, 3, 4</entry>
<entry><filename>multi-user.target</filename></entry>
</row>
<row>
<entry>5</entry>
<entry><filename>graphical.target</filename></entry>
</row>
<row>
<entry>6</entry>
<entry><filename>reboot.target</filename></entry>
</row>
</tbody>
</tgroup>
</table>
</refsect1>
<refsect1>
<title>Description</title>
@ -129,18 +180,11 @@
</variablelist>
</refsect1>
<refsect1>
<title>Notes</title>
<para>This is a legacy command available for compatibility only.
It should not be used anymore, as the concept of runlevels is
obsolete.</para>
</refsect1>
<refsect1>
<title>See Also</title>
<para>
<citerefentry><refentrytitle>systemd</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
<citerefentry><refentrytitle>systemd.target</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
<citerefentry><refentrytitle>systemctl</refentrytitle><manvolnum>1</manvolnum></citerefentry>
</para>
</refsect1>

View File

@ -121,10 +121,10 @@
<title>Description</title>
<para>In addition to the error names user programs define, D-Bus
knows a number of generic, standardized error names, that are
knows a number of generic, standardized error names that are
listed below.</para>
<para>In addition to this list, in sd-bus the special error
<para>In addition to this list, in sd-bus, the special error
namespace <literal>System.Error.</literal> is used to map
arbitrary Linux system errors (as defined by <citerefentry
project='man-pages'><refentrytitle>errno</refentrytitle><manvolnum>3</manvolnum></citerefentry>)
@ -167,7 +167,7 @@
<varlistentry>
<term><varname>SD_BUS_ERROR_IO_ERROR</varname></term>
<listitem><para>Generic input/output error, for example when
accessing a socket or other IO context.</para></listitem>
accessing a socket or other I/O context.</para></listitem>
</varlistentry>
<varlistentry>
<term><varname>SD_BUS_ERROR_BAD_ADDRESS</varname></term>
@ -186,7 +186,7 @@
</varlistentry>
<varlistentry>
<term><varname>SD_BUS_ERROR_ACCESS_DENIED</varname></term>
<listitem><para>Access to a resource has been denied, due to security restrictions.</para></listitem>
<listitem><para>Access to a resource has been denied due to security restrictions.</para></listitem>
</varlistentry>
<varlistentry>
<term><varname>SD_BUS_ERROR_AUTH_FAILED</varname></term>
@ -224,7 +224,7 @@
</varlistentry>
<varlistentry>
<term><varname>SD_BUS_ERROR_FILE_EXISTS</varname></term>
<listitem><para>The requested file exists already.</para></listitem>
<listitem><para>The requested file already exists.</para></listitem>
</varlistentry>
<varlistentry>
<term><varname>SD_BUS_ERROR_UNKNOWN_METHOD</varname></term>
@ -272,7 +272,7 @@
<varlistentry>
<term><varname>SD_BUS_ERROR_INTERACTIVE_AUTHORIZATION_REQUIRED</varname></term>
<listitem><para>Access to the requested operation is not
permitted, however, it might be available after interactive
permitted. However, it might be available after interactive
authentication. This is usually returned by method calls
supporting a framework for additional interactive
authorization, when interactive authorization was not enabled

View File

@ -317,7 +317,7 @@
to determine the mask of fields available.</para>
<para><function>sd_bus_creds_get_pid()</function> will retrieve
the PID (process identifier). Similar,
the PID (process identifier). Similarly,
<function>sd_bus_creds_get_ppid()</function> will retrieve the
parent PID. Note that PID 1 has no parent process, in which case
-ENXIO is returned.</para>
@ -326,14 +326,14 @@
TID (thread identifier).</para>
<para><function>sd_bus_creds_get_uid()</function> will retrieve
the numeric UID (user identifier). Similar,
the numeric UID (user identifier). Similarly,
<function>sd_bus_creds_get_euid()</function> returns the effective
UID, <function>sd_bus_creds_get_suid()</function> the saved UID
and <function>sd_bus_creds_get_fsuid()</function> the file system
UID.</para>
<para><function>sd_bus_creds_get_gid()</function> will retrieve the
numeric GID (group identifier). Similar,
numeric GID (group identifier). Similarly,
<function>sd_bus_creds_get_egid()</function> returns the effective
GID, <function>sd_bus_creds_get_sgid()</function> the saved GID
and <function>sd_bus_creds_get_fsgid()</function> the file system
@ -355,7 +355,7 @@
<para><function>sd_bus_creds_get_exe()</function> will retrieve
the path to the program executable (as stored in the
<filename>/proc/<replaceable>pid</replaceable>/exe</filename>
link, but with <literal> (deleted)</literal> suffix removed). Note
link, but with the <literal> (deleted)</literal> suffix removed). Note
that kernel threads do not have an executable path, in which case
-ENXIO is returned.</para>
@ -372,38 +372,38 @@
<para><function>sd_bus_creds_get_unit()</function> will retrieve
the systemd unit name (in the system instance of systemd) that the
process is part of. See
process is a part of. See
<citerefentry><refentrytitle>systemd.unit</refentrytitle><manvolnum>5</manvolnum></citerefentry>. For
processes that are not part of a unit returns -ENXIO.
processes that are not part of a unit, returns -ENXIO.
</para>
<para><function>sd_bus_creds_get_user_unit()</function> will
retrieve the systemd unit name (in the user instance of systemd)
that the process is part of. See
that the process is a part of. See
<citerefentry><refentrytitle>systemd.unit</refentrytitle><manvolnum>5</manvolnum></citerefentry>. For
processes that are not part of a user unit returns -ENXIO.
processes that are not part of a user unit, returns -ENXIO.
</para>
<para><function>sd_bus_creds_get_slice()</function> will retrieve
the systemd slice (a unit in the system instance of systemd) that
the process is part of. See
<citerefentry><refentrytitle>systemd.slice</refentrytitle><manvolnum>5</manvolnum></citerefentry>. Similar,
the process is a part of. See
<citerefentry><refentrytitle>systemd.slice</refentrytitle><manvolnum>5</manvolnum></citerefentry>. Similarly,
<function>sd_bus_creds_get_user_slice()</function> retrieves the
systemd slice of the process, in the user instance of systemd.
</para>
<para><function>sd_bus_creds_get_session()</function> will
retrieve the identifier of the login session that the process is
part of. See
a part of. See
<citerefentry><refentrytitle>systemd-logind.service</refentrytitle><manvolnum>8</manvolnum></citerefentry>. For
processes that are not part of a session returns -ENXIO.
processes that are not part of a session, returns -ENXIO.
</para>
<para><function>sd_bus_creds_get_owner_uid()</function> will
retrieve the numeric UID (user identifier) of the user who owns
the login session that the process is part of. See
the login session that the process is a part of. See
<citerefentry><refentrytitle>systemd-logind.service</refentrytitle><manvolnum>8</manvolnum></citerefentry>.
For processes that are not part of a session returns -ENXIO.
For processes that are not part of a session, returns -ENXIO.
</para>
<para><function>sd_bus_creds_has_effective_cap()</function> will
@ -494,7 +494,7 @@
<varlistentry>
<term><constant>-ENODATA</constant></term>
<listitem><para>Given field is not available in the
<listitem><para>The given field is not available in the
credentials object <parameter>c</parameter>.</para>
</listitem>
</varlistentry>
@ -502,7 +502,7 @@
<varlistentry>
<term><constant>-ENXIO</constant></term>
<listitem><para>Given field is not specified for the described
<listitem><para>The given field is not specified for the described
process or peer. This will be returned by
<function>sd_bus_get_unit()</function>,
<function>sd_bus_get_slice()</function>,
@ -514,8 +514,8 @@
slice, or logind session. It will also be returned by
<function>sd_bus_creds_get_exe()</function> and
<function>sd_bus_creds_get_cmdline()</function> for kernel
threads (since these aren't started from an executable binary
or have a command line),
threads (since these are not started from an executable binary,
nor have a command line), and by
<function>sd_bus_creds_get_audit_session_id()</function> and
<function>sd_bus_creds_get_audit_login_uid()</function> when
the process is not part of an audit session, and

View File

@ -130,7 +130,7 @@
<para><function>sd_bus_creds_new_from_pid()</function> creates a
new credentials object and fills it with information about the
process <parameter>pid</parameter>. The pointer to this object
will be stored in <parameter>ret</parameter> pointer. Note that
will be stored in the <parameter>ret</parameter> pointer. Note that
credential objects may also be created and retrieved via
<citerefentry><refentrytitle>sd_bus_get_name_creds</refentrytitle><manvolnum>3</manvolnum></citerefentry>,
<citerefentry><refentrytitle>sd_bus_get_owner_creds</refentrytitle><manvolnum>3</manvolnum></citerefentry>
@ -171,11 +171,11 @@
<constant>SD_BUS_CREDS_AUDIT_LOGIN_UID</constant>,
<constant>SD_BUS_CREDS_TTY</constant>,
<constant>SD_BUS_CREDS_UNIQUE_NAME</constant>,
<constant>SD_BUS_CREDS_WELL_KNOWN_NAMES</constant>,
<constant>SD_BUS_CREDS_WELL_KNOWN_NAMES</constant>, and
<constant>SD_BUS_CREDS_DESCRIPTION</constant>. Use the special
value <constant>_SD_BUS_CREDS_ALL</constant> to request all
supported fields. The <constant>SD_BUS_CREDS_AUGMENT</constant>
may not be ORed into the mask for invocations of
constant may not be ORed into the mask for invocations of
<function>sd_bus_creds_new_from_pid()</function>.</para>
<para>Fields can be retrieved from the credentials object using
@ -191,35 +191,35 @@
subset of fields requested in <parameter>creds_mask</parameter>.
</para>
<para>Similar to <function>sd_bus_creds_get_mask()</function> the
<para>Similar to <function>sd_bus_creds_get_mask()</function>, the
function <function>sd_bus_creds_get_augmented_mask()</function>
returns a bitmask of field constants. The mask indicates which
credential fields have been retrieved in a non-atomic fashion. For
credential objects created via
<function>sd_bus_creds_new_from_pid()</function> this mask will be
<function>sd_bus_creds_new_from_pid()</function>, this mask will be
identical to the mask returned by
<function>sd_bus_creds_get_mask()</function>. However, for
credential objects retrieved via
<function>sd_bus_get_name_creds()</function> this mask will be set
<function>sd_bus_get_name_creds()</function>, this mask will be set
for the credential fields that could not be determined atomically
at peer connection time, and which were later added by reading
augmenting credential data from
<filename>/proc</filename>. Similar, for credential objects
retrieved via <function>sd_bus_get_owner_creds()</function> the
<filename>/proc</filename>. Similarly, for credential objects
retrieved via <function>sd_bus_get_owner_creds()</function>, the
mask is set for the fields that could not be determined atomically
at bus creation time, but have been augmented. Similar, for
at bus creation time, but have been augmented. Similarly, for
credential objects retrieved via
<function>sd_bus_message_get_creds()</function> the mask is set
<function>sd_bus_message_get_creds()</function>, the mask is set
for the fields that could not be determined atomically at message
send time, but have been augmented. The mask returned by
sending time, but have been augmented. The mask returned by
<function>sd_bus_creds_get_augmented_mask()</function> is always a
subset of (or identical to) the mask returned by
<function>sd_bus_creds_get_mask()</function> for the same
object. The latter call hence returns all credential fields
available in the credential object, the former then marks the
subset of those that have been augmented. Note that augmented
fields are unsuitable for authorization decisions as they may be
retrieved at different times, thus being subject to races. Hence
fields are unsuitable for authorization decisions, as they may be
retrieved at different times, thus being subject to races. Hence,
augmented fields should be used exclusively for informational
purposes.
</para>

View File

@ -112,7 +112,7 @@
connection object to the user bus when invoked in user context, or
to the system bus otherwise. The connection object is associated
with the calling thread. Each time the function is invoked from
the same thread the same object is returned, but its reference
the same thread, the same object is returned, but its reference
count is increased by one, as long as at least one reference is
kept. When the last reference to the connection is dropped (using
the
@ -120,8 +120,8 @@
call), the connection is terminated. Note that the connection is
not automatically terminated when the associated thread ends. It
is important to drop the last reference to the bus connection
explicitly before the thread ends or otherwise the connection will
be leaked. Also, queued but unread or unwritten messages keep the
explicitly before the thread ends, as otherwise, the connection will
leak. Also, queued but unread or unwritten messages keep the
bus referenced, see below.</para>
<para><function>sd_bus_default_user()</function> returns a user
@ -139,14 +139,14 @@
<function>sd_bus_open_system()</function> does the same, but
connects to the system bus. In contrast to
<function>sd_bus_default()</function>,
<function>sd_bus_default_user()</function>,
<function>sd_bus_default_system()</function> these calls return
<function>sd_bus_default_user()</function>, and
<function>sd_bus_default_system()</function>, these calls return
new, independent connection objects that are not associated with
the invoking thread and are not shared between multiple
invocations. It is recommended to share connections per thread to
efficiently make use the available resources. Thus, it is
recommended to use <function>sd_bus_default()</function>,
<function>sd_bus_default_user()</function>,
<function>sd_bus_default_user()</function> and
<function>sd_bus_default_system()</function> to connect to the
user or system buses.</para>
@ -215,31 +215,31 @@
<para>Queued but unwritten/unread messages also keep a reference
to their bus connection object. For this reason, even if an
application dropped all references to a bus connection it might
not get destroyed right-away. Until all incoming queued
application dropped all references to a bus connection, it might
not get destroyed right away. Until all incoming queued
messages are read, and until all outgoing unwritten messages are
written, the bus object will stay
alive. <function>sd_bus_flush()</function> may be used to write
all outgoing queued messages so they drop their references. To
flush the unread incoming messages use
flush the unread incoming messages, use
<function>sd_bus_close()</function>, which will also close the bus
connection. When using the default bus logic it is a good idea to
connection. When using the default bus logic, it is a good idea to
first invoke <function>sd_bus_flush()</function> followed by
<function>sd_bus_close()</function> when a thread or process
terminates, and thus its bus connection object should be
freed.</para>
<para>The life-cycle of the default bus connection should be the
<para>The life cycle of the default bus connection should be the
responsibility of the code that creates/owns the thread the
default bus connection object is associated with. Library code
should neither call <function>sd_bus_flush()</function> nor
<function>sd_bus_close()</function> on default bus objects unless
it does so in its own private, self-allocated thread. Library code
should not use the default bus object in other threads unless it
is clear that the program using it will life-cycle the bus
is clear that the program using it will life cycle the bus
connection object and flush and close it before exiting from the
thread. In libraries where it is not clear that the calling
program will life-cycle the bus connection object it is hence
program will life cycle the bus connection object, it is hence
recommended to use <function>sd_bus_open_system()</function>
instead of <function>sd_bus_default_system()</function> and
related calls.</para>

View File

@ -167,7 +167,7 @@
<citerefentry><refentrytitle>sd-bus-errors</refentrytitle><manvolnum>3</manvolnum></citerefentry>,
but additional domain-specific errors may be defined by
applications. The <structfield>message</structfield> field usually
contains a human readable string describing the details, but might
contains a human-readable string describing the details, but might
be NULL. An unset <structname>sd_bus_error</structname> structure
should have both fields initialized to NULL. Set an error
structure to <constant>SD_BUS_ERROR_NULL</constant> in order to
@ -189,20 +189,20 @@
for a list of well-known error names. Additional error mappings
may be defined with
<citerefentry><refentrytitle>sd_bus_error_add_map</refentrytitle><manvolnum>3</manvolnum></citerefentry>. If
<parameter>e</parameter> is NULL no error structure is initialized
<parameter>e</parameter> is NULL, no error structure is initialized,
but the error is still converted into an
<varname>errno</varname>-style error. If
<parameter>name</parameter> is <constant>NULL</constant>, it is
assumed that no error occurred, and 0 is returned. This means that
this function may be conveniently used in a
<function>return</function> statement. If
<parameter>message</parameter> is NULL no message is set. This
<parameter>message</parameter> is NULL, no message is set. This
call can fail if no memory may be allocated for the name and
message strings, in which case an
<constant>SD_BUS_ERROR_NO_MEMORY</constant> error might be set
instead and -ENOMEM returned. Do not use this call on error
instead and -ENOMEM be returned. Do not use this call on error
structures that are already initialized. If you intend to reuse an
error structure free the old data stored in it with
error structure, free the old data stored in it with
<function>sd_bus_error_free()</function> first.</para>
<para><function>sd_bus_error_setf()</function> is similar to
@ -216,8 +216,8 @@
are not copied internally, and must hence remain constant and
valid for the lifetime of <parameter>e</parameter>. Use this call
to avoid memory allocations when setting error structures. Since
this call does not allocate memory it will not fail with an
out-of-memory condition, as
this call does not allocate memory, it will not fail with an
out-of-memory condition as
<function>sd_bus_error_set()</function> can, as described
above. Alternatively, the
<constant>SD_BUS_ERROR_MAKE_CONST()</constant> macro may be used
@ -238,7 +238,7 @@
convenient usage in <function>return</function> statements. This
call might fail due to lack of memory, in which case an
<constant>SD_BUS_ERROR_NO_MEMORY</constant> error is set instead,
and -ENOMEM returned.</para>
and -ENOMEM is returned.</para>
<para><function>sd_bus_error_set_errnof()</function> is similar to
<function>sd_bus_error_set_errno()</function>, but in addition to
@ -249,7 +249,7 @@
<parameter>format</parameter> and the arguments.</para>
<para><function>sd_bus_error_set_errnofv()</function> is similar to
<function>sd_bus_error_set_errnof()</function> but takes the
<function>sd_bus_error_set_errnof()</function>, but takes the
format string parameters as <citerefentry
project='man-pages'><refentrytitle>va_arg</refentrytitle><manvolnum>3</manvolnum></citerefentry>
parameter list.</para>
@ -295,10 +295,10 @@
<title>Return Value</title>
<para>The functions <function>sd_bus_error_set()</function>,
<function>sd_bus_error_setf()</function>,
<function>sd_bus_error_setf()</function>, and
<function>sd_bus_error_set_const()</function>, when successful,
return the negative errno value corresponding to the
<parameter>name</parameter> parameter. Functions
<parameter>name</parameter> parameter. The functions
<function>sd_bus_error_set_errno()</function>,
<function>sd_bus_error_set_errnof()</function> and
<function>sd_bus_error_set_errnofv()</function>, when successful,
@ -331,7 +331,7 @@
<title>Reference ownership</title>
<para><structname>sd_bus_error</structname> is not reference
counted. Users should destroy resources held by it by calling
<function>sd_bus_error_free()</function>. Usually error structures
<function>sd_bus_error_free()</function>. Usually, error structures
are allocated on the stack or passed in as function parameters,
but they may also be allocated dynamically, in which case it is
the duty of the caller to <citerefentry

View File

@ -87,7 +87,7 @@
<citerefentry><refentrytitle>sd_bus_error_set</refentrytitle><manvolnum>3</manvolnum></citerefentry>
or
<citerefentry><refentrytitle>sd_bus_error_get_errno</refentrytitle><manvolnum>3</manvolnum></citerefentry>. By
default a number of generic, standardized mappings are known, as
default, a number of generic, standardized mappings are known, as
documented in
<citerefentry><refentrytitle>sd-bus-errors</refentrytitle><manvolnum>3</manvolnum></citerefentry>. Use
this call to add further, application-specific mappings.</para>
@ -95,12 +95,12 @@
<para>The function takes a pointer to an array of
<structname>sd_bus_error_map</structname> structures. A reference
to the specified array is added to the lookup tables for error
mappings. Note that the structure is not copied, it is hence
mappings. Note that the structure is not copied, and that it is hence
essential that the array stays available and constant during the
entire remaining runtime of the process.</para>
<para>The mapping array should be put together with a series of
<constant>SD_BUS_ERROR_MAP()</constant> macro invocations, that
<constant>SD_BUS_ERROR_MAP()</constant> macro invocations that
take a literal name string and a (positive)
<varname>errno</varname>-style error number. The last entry of the
array should be an invocation of the

View File

@ -70,7 +70,7 @@
appends a sequence of fields to the D-Bus message object
<parameter>m</parameter>. The type string
<parameter>types</parameter> describes the types of the field
arguments that follow. For each type specified in the type string
arguments that follow. For each type specified in the type string,
one or more arguments need to be specified, in the same order as
declared in the type string.</para>

View File

@ -131,8 +131,8 @@
<parameter>type</parameter>. However, as a special exception, if
the offset is specified as zero and the size specified as
UINT64_MAX the full memory file descriptor contents is used. The
memory file descriptor is sealed by this call if it hasn't been
sealed yet, and cannot be modified a after this call. See
memory file descriptor is sealed by this call if it has not been
sealed yet, and cannot be modified after this call. See
<citerefentry
project='man-pages'><refentrytitle>memfd_create</refentrytitle><manvolnum>2</manvolnum></citerefentry>
for details about memory file descriptors. Appending arrays with
@ -142,7 +142,7 @@
process. Not all protocol transports support passing memory file
descriptors between participants, in which case this call will
automatically fall back to copying. Also, as memory file
descriptor passing is inefficient for smaller amounts of data
descriptor passing is inefficient for smaller amounts of data,
copying might still be enforced even where memory file descriptor
passing is supported.</para>
@ -150,13 +150,13 @@
function appends an array of a trivial type to the message
<parameter>m</parameter>, similar to
<function>sd_bus_message_append_array()</function>. Contents of
the IO vector array <parameter>iov</parameter> are used as the
the I/O vector array <parameter>iov</parameter> are used as the
contents of the array. The total size of
<parameter>iov</parameter> payload (the sum of
<structfield>iov_len</structfield> fields) must be a multiple of
the size of the type <parameter>type</parameter>. The
<parameter>iov</parameter> argument must point to
<parameter>n</parameter> IO vector structures. Each structure may
<parameter>n</parameter> I/O vector structures. Each structure may
have the <structname>iov_base</structname> field set, in which
case the memory pointed to will be copied into the message, or
unset (set to zero), in which case a block of zeros of length
@ -171,9 +171,9 @@
copying items to the message, it returns a pointer to the
destination area to the caller in pointer
<parameter>p</parameter>. The caller should subsequently write the
array contents to this memory. Modifications of the memory
array contents to this memory. Modifications to the memory
pointed to should only occur until the next operation on the bus
message is invoked, most importantly the memory should not be
message is invoked. Most importantly, the memory should not be
altered anymore when another field has been added to the message
or the message has been sealed.</para>
</refsect1>

View File

@ -83,7 +83,7 @@
<citerefentry><refentrytitle>clock_gettime</refentrytitle><manvolnum>2</manvolnum></citerefentry>
for details.</para>
<para>Similar,
<para>Similarly,
<function>sd_bus_message_get_realtime_usec()</function> returns
the realtime (wallclock) timestamp of the time the message was
sent. This value is in microseconds since Jan 1st, 1970, i.e. in

View File

@ -108,7 +108,7 @@
<citerefentry><refentrytitle>sd_bus_message_get_realtime_usec</refentrytitle><manvolnum>3</manvolnum></citerefentry>,
<citerefentry><refentrytitle>sd_bus_message_get_seqnum</refentrytitle><manvolnum>3</manvolnum></citerefentry>
to query the timestamps of incoming messages. If negotiation is
disabled or not supported these calls will fail with
disabled or not supported, these calls will fail with
<constant>-ENODATA</constant>. Note that not all transports
support timestamping of messages. Specifically, timestamping is
only available on the kdbus transport, but not on dbus1. The
@ -118,7 +118,7 @@
<para><function>sd_bus_negotiate_creds()</function> controls
whether and which implicit sender credentials shall be attached
automatically to all incoming messages. Takes a bus object, a
automatically to all incoming messages. Takes a bus object and a
boolean indicating whether to enable or disable the credential
parts encoded in the bit mask value argument. Note that not all
transports support attaching sender credentials to messages, or do
@ -140,10 +140,10 @@
<citerefentry><refentrytitle>sd_bus_start</refentrytitle><manvolnum>3</manvolnum></citerefentry>. Both
<function>sd_bus_negotiate_timestamp()</function> and
<function>sd_bus_negotiate_creds()</function> may also be called
after a connection has been set up. Note that when operating on a
after a connection has been set up. Note that, when operating on a
connection that is shared between multiple components of the same
program (for example via
<citerefentry><refentrytitle>sd_bus_default</refentrytitle><manvolnum>3</manvolnum></citerefentry>)
<citerefentry><refentrytitle>sd_bus_default</refentrytitle><manvolnum>3</manvolnum></citerefentry>),
it is highly recommended to only enable additional per message
metadata fields, but never disable them again, in order not to
disable functionality needed by other components.</para>

View File

@ -84,7 +84,7 @@
or a related call, and then start the connection with
<citerefentry><refentrytitle>sd_bus_start</refentrytitle><manvolnum>3</manvolnum></citerefentry>.</para>
<para>In most cases it's a better idea to invoke
<para>In most cases, it is a better idea to invoke
<citerefentry><refentrytitle>sd_bus_default_user</refentrytitle><manvolnum>3</manvolnum></citerefentry>,
<citerefentry><refentrytitle>sd_bus_default_system</refentrytitle><manvolnum>3</manvolnum></citerefentry>
or related calls instead of the more low-level

View File

@ -128,23 +128,23 @@
<para><function>sd_bus_path_encode_many()</function> works like
its counterpart <function>sd_bus_path_encode()</function>, but
takes a path-template as argument and encodes multiple labels
takes a path template as argument and encodes multiple labels
according to its embedded directives. For each
<literal>%</literal> character found in the template, the caller
must provide a string via var-args, which will be encoded and
must provide a string via varargs, which will be encoded and
embedded at the position of the <literal>%</literal> character.
Any other character in the template is copied verbatim into the
encoded path.</para>
<para><function>sd_bus_path_decode_many()</function> does the
reverse of <function>sd_bus_path_encode_many()</function>. It
decodes the passed object path, according to the given
path-template. For each <literal>%</literal> character in the
decodes the passed object path according to the given
path template. For each <literal>%</literal> character in the
template, the caller must provide an output storage
(<literal>char **</literal>) via var-args. The decoded label
(<literal>char **</literal>) via varargs. The decoded label
will be stored there. Each <literal>%</literal> character will
only match the current label. It will never match across labels.
Furthermore, only a single such directive is allowed per label.
Furthermore, only a single directive is allowed per label.
If <literal>NULL</literal> is passed as output storage, the
label is verified but not returned to the caller.</para>
</refsect1>

View File

@ -157,7 +157,7 @@
<varlistentry>
<term><constant>-EBUSY</constant></term>
<listitem><para>An handler is already installed for this
<listitem><para>A handler is already installed for this
child.</para></listitem>
</varlistentry>

View File

@ -90,7 +90,7 @@
<refsect1>
<title>Description</title>
<para>Those three functions add new event sources to an event loop
<para>These three functions add new event sources to an event loop
object. The event loop is specified in
<parameter>event</parameter>, the event source is returned in the
<parameter>source</parameter> parameter. The event sources are

View File

@ -82,7 +82,7 @@
<para><function>sd_event_add_signal()</function> adds a new signal
event source to an event loop object. The event loop is specified
in <parameter>event</parameter>, the event source is returned in
in <parameter>event</parameter>, and the event source is returned in
the <parameter>source</parameter> parameter. The
<parameter>signal</parameter> parameter specifies the signal to be handled
(see
@ -149,7 +149,7 @@
<varlistentry>
<term><constant>-EBUSY</constant></term>
<listitem><para>An handler is already installed for this
<listitem><para>A handler is already installed for this
signal or the signal was not blocked previously.</para></listitem>
</varlistentry>

View File

@ -114,7 +114,7 @@
<function>sd_event_default()</function>, then releasing it, and
then acquiring a new one with
<function>sd_event_default()</function> will result in two
distinct objects. Note that in order to free an event loop object,
distinct objects. Note that, in order to free an event loop object,
all remaining event sources of the event loop also need to be
freed as each keeps a reference to it.</para>
</refsect1>

View File

@ -46,7 +46,7 @@
<refname>sd_event_run</refname>
<refname>sd_event_loop</refname>
<refpurpose>Run libsystemd event loop</refpurpose>
<refpurpose>Run the libsystemd event loop</refpurpose>
</refnamediv>
<refsynopsisdiv>
@ -71,8 +71,8 @@
<para><function>sd_event_run()</function> can be used to run one
iteration of the event loop of libsystemd. This function waits
until an event to process is available and dispatches a handler
for it. Parameter <parameter>timeout</parameter> specifices the
until an event to process is available, and dispatches a handler
for it. The <parameter>timeout</parameter> parameter specifices the
maximum time (in microseconds) to wait. <constant>(uint64_t)
-1</constant> may be used to specify an infinite timeout.</para>
@ -121,7 +121,7 @@
<varlistentry>
<term><constant>-EINVAL</constant></term>
<listitem><para>Parameter <parameter>event</parameter> is
<listitem><para>The <parameter>event</parameter> parameter is
<constant>NULL</constant>.</para></listitem>
</varlistentry>
@ -150,7 +150,7 @@
</variablelist>
<para>Other errors are possible too.</para>
<para>Other errors are possible, too.</para>
</refsect1>
<refsect1>
@ -176,7 +176,7 @@
<citerefentry><refentrytitle>sd_event_add_defer</refentrytitle><manvolnum>3</manvolnum></citerefentry>,
<citerefentry><refentrytitle>sd_event_add_exit</refentrytitle><manvolnum>3</manvolnum></citerefentry>,
<citerefentry><refentrytitle>sd_event_add_post</refentrytitle><manvolnum>3</manvolnum></citerefentry>,
<ulink url="https://developer.gnome.org/glib/unstable/glib-The-Main-Event-Loop.html">GLIb Main Event Loop</ulink>.
<ulink url="https://developer.gnome.org/glib/unstable/glib-The-Main-Event-Loop.html">GLib Main Event Loop</ulink>.
</para>
</refsect1>

View File

@ -77,7 +77,7 @@
<parameter>source</parameter>. This name will be used in error
messages generated by
<citerefentry><refentrytitle>sd-event</refentrytitle><manvolnum>3</manvolnum></citerefentry>
for this source. Specified <parameter>name</parameter> must point
for this source. The <parameter>name</parameter> must point
to a <constant>NUL</constant>-terminated string or be
<constant>NULL</constant>. In the latter case, the name will be
unset. The string is copied internally, so the
@ -128,7 +128,7 @@
<refsect1>
<title>Notes</title>
<para>Functions described here are available as a
<para>The functions described here are available as a
shared library, which can be compiled and linked to with the
<constant>libsystemd</constant> <citerefentry
project='die-net'><refentrytitle>pkg-config</refentrytitle><manvolnum>1</manvolnum></citerefentry>

View File

@ -47,7 +47,7 @@
<refname>sd_event_prepare</refname>
<refname>sd_event_dispatch</refname>
<refpurpose>Run parts of libsystemd event loop</refpurpose>
<refpurpose>Run parts of the libsystemd event loop</refpurpose>
</refnamediv>
<refsynopsisdiv>
@ -123,8 +123,8 @@
└──────────┘
</programlisting>
<para>All three functions as the first argument take the event
loop object <parameter>event</parameter> that is created with with
<para>All three functions take, as the first argument, the event
loop object <parameter>event</parameter> that is created with
<function>sd_event_new</function>. The timeout for
<function>sd_event_wait</function> is specified with
<parameter>timeout</parameter> in milliseconds.
@ -138,11 +138,11 @@
<para>On success, these functions return 0 or a positive integer.
On failure, they return a negative errno-style error code. In case
of <function>sd_event_prepare</function> and
<function>sd_event_wait</function> a positive value means that
<function>sd_event_wait</function>, a positive value means that
events are ready to be processed and 0 means that no events are
ready. In case of <function>sd_event_dispatch</function> a
ready. In case of <function>sd_event_dispatch</function>, a
positive value means that the loop is again in the initial state
and 0 means the loop is finished. For any of those functions, a
and 0 means the loop is finished. For any of these functions, a
negative return value means the loop must be aborted.</para>
</refsect1>
@ -155,7 +155,7 @@
<varlistentry>
<term><constant>-EINVAL</constant></term>
<listitem><para>Parameter <parameter>event</parameter> is
<listitem><para>The <parameter>event</parameter> parameter is
<constant>NULL</constant>.</para></listitem>
</varlistentry>
@ -182,7 +182,7 @@
</variablelist>
<para>Other errors are possible too.</para>
<para>Other errors are possible, too.</para>
</refsect1>
<refsect1>

View File

@ -127,7 +127,7 @@
<term><constant>-EINVAL</constant></term>
<listitem><para>An input parameter was invalid (out of range,
or NULL, where that's not accepted).</para></listitem>
or NULL, where that is not accepted).</para></listitem>
</varlistentry>
<varlistentry>

View File

@ -89,7 +89,7 @@
and
<citerefentry><refentrytitle>sd_journal_get_data</refentrytitle><manvolnum>3</manvolnum></citerefentry>.
Matches are of the form <literal>FIELD=value</literal>, where the
field part is a short uppercase string consisting only of 0-9, A-Z
field part is a short uppercase string consisting only of 09, AZ
and the underscore. It may not begin with two underscores or be
the empty string. The value part may be any value, including
binary. If a match is applied, only entries with this field set

View File

@ -113,7 +113,7 @@
<function>sd_journal_get_data()</function> or
<function>sd_journal_enumerate_data()</function>, or the read
pointer is altered. Note that the data returned will be prefixed
with the field name and '='. Also note that by default data fields
with the field name and '='. Also note that, by default, data fields
larger than 64K might get truncated to 64K. This threshold may be
changed and turned off with
<function>sd_journal_set_data_threshold()</function> (see

View File

@ -187,7 +187,7 @@ else {
certain latency. This call will return a positive value if the
journal changes are detected immediately and zero when they need
to be polled for and hence might be noticed only with a certain
latency. Note that there's usually no need to invoke this function
latency. Note that there is usually no need to invoke this function
directly as <function>sd_journal_get_timeout()</function> on these
file systems will ask for timeouts explicitly anyway.</para>
</refsect1>

View File

@ -100,8 +100,8 @@
<para><function>sd_journal_open()</function> opens the log journal
for reading. It will find all journal files automatically and
interleave them automatically when reading. As first argument it
takes a pointer to a <varname>sd_journal</varname> pointer, which
on success will contain a journal context object. The second
takes a pointer to a <varname>sd_journal</varname> pointer, which,
on success, will contain a journal context object. The second
argument is a flags field, which may consist of the following
flags ORed together: <constant>SD_JOURNAL_LOCAL_ONLY</constant>
makes sure only journal files generated on the local machine will

View File

@ -134,8 +134,8 @@
be ignored.) The value can be of any size and format. It is highly
recommended to submit text strings formatted in the UTF-8
character encoding only, and submit binary fields only when
formatting in UTF-8 strings is not sensible. A number of well
known fields are defined, see
formatting in UTF-8 strings is not sensible. A number of
well-known fields are defined, see
<citerefentry><refentrytitle>systemd.journal-fields</refentrytitle><manvolnum>7</manvolnum></citerefentry>
for details, but additional application defined fields may be
used. A variable may be assigned more than one value per
@ -156,7 +156,7 @@
<para><function>sd_journal_perror()</function> is a similar to
<citerefentry project='die-net'><refentrytitle>perror</refentrytitle><manvolnum>3</manvolnum></citerefentry>
and writes a message to the journal that consists of the passed
string, suffixed with ": " and a human readable representation of
string, suffixed with ": " and a human-readable representation of
the current error code stored in
<citerefentry project='man-pages'><refentrytitle>errno</refentrytitle><manvolnum>3</manvolnum></citerefentry>.
If the message string is passed as <constant>NULL</constant> or

View File

@ -76,7 +76,7 @@
daemon to check for file descriptors passed by the service manager as
part of the socket-based activation logic. It returns the number
of received file descriptors. If no file descriptors have been
received zero is returned. The first file descriptor may be found
received, zero is returned. The first file descriptor may be found
at file descriptor number 3
(i.e. <constant>SD_LISTEN_FDS_START</constant>), the remaining
descriptors follow at 4, 5, 6, ..., if any.</para>
@ -104,7 +104,7 @@
passed file descriptors to avoid further inheritance to children
of the calling process.</para>
<para>If multiple socket units activate the same service the order
<para>If multiple socket units activate the same service, the order
of the file descriptors passed to its main process is undefined.
If additional file descriptors have been passed to the service
manager using
@ -123,9 +123,9 @@
variables are no longer inherited by child processes.</para>
<para><function>sd_listen_fds_with_names()</function> is like
<function>sd_listen_fds()</function> but optionally also returns
<function>sd_listen_fds()</function>, but optionally also returns
an array of strings with identification names for the passed file
descriptors, if that is available, and the
descriptors, if that is available and the
<parameter>names</parameter> parameter is non-NULL. This
information is read from the <varname>$LISTEN_FDNAMES</varname>
variable, which may contain a colon-separated list of names. For
@ -134,7 +134,7 @@
files, see
<citerefentry><refentrytitle>systemd.socket</refentrytitle><manvolnum>5</manvolnum></citerefentry>
for details. For file descriptors pushed into the file descriptor
store (see above) the name is set via the
store (see above), the name is set via the
<varname>FDNAME=</varname> field transmitted via
<function>sd_pid_notify_with_fds()</function>. The primary usecase
for these names are services which accept a variety of file
@ -145,14 +145,14 @@
<function>sd_is_socket()</function> and related calls is not
sufficient. Note that the names used are not unique in any
way. The returned array of strings has as many entries as file
descriptors has been received, plus a final NULL pointer
descriptors have been received, plus a final NULL pointer
terminating the array. The caller needs to free the array itself
and each of its elements with libc's <function>free()</function>
call after use. If the <parameter>names</parameter> parameter is
NULL the call is entirely equivalent to
NULL, the call is entirely equivalent to
<function>sd_listen_fds()</function>.</para>
<para>Under specific conditions the following automatic file
<para>Under specific conditions, the following automatic file
descriptor names are returned:
<table>

View File

@ -214,7 +214,7 @@ else {
<term><constant>-EINVAL</constant></term>
<listitem><para>An input parameter was invalid (out of range,
or NULL, where that's not accepted). The specified category to
or NULL, where that is not accepted). The specified category to
watch is not known.</para></listitem>
</varlistentry>

View File

@ -116,7 +116,7 @@
<term><constant>-EINVAL</constant></term>
<listitem><para>An input parameter was invalid (out of range,
or NULL, where that's not accepted).</para></listitem>
or NULL, where that is not accepted).</para></listitem>
</varlistentry>
<varlistentry>

View File

@ -100,7 +100,7 @@
<para><function>sd_notify()</function> may be called by a service
to notify the service manager about state changes. It can be used
to send arbitrary information, encoded in an
environment-block-like string. Most importantly it can be used for
environment-block-like string. Most importantly, it can be used for
start-up completion notification.</para>
<para>If the <parameter>unset_environment</parameter> parameter is
@ -158,7 +158,7 @@
to the service manager that describes the service state. This
is free-form and can be used for various purposes: general
state feedback, fsck-like programs could pass completion
percentages and failing programs could pass a human readable
percentages and failing programs could pass a human-readable
error message. Example: <literal>STATUS=Completed 66% of file
system check...</literal></para></listitem>
</varlistentry>
@ -233,21 +233,21 @@
<term>FDNAME=...</term>
<listitem><para>When used in combination with
<varname>FDSTORE=1</varname> specifies a name for the
<varname>FDSTORE=1</varname>, specifies a name for the
submitted file descriptors. This name is passed to the service
during activation, and may be queried using
<citerefentry><refentrytitle>sd_listen_fds_with_names</refentrytitle><manvolnum>3</manvolnum></citerefentry>. File
descriptors submitted without this field set, will implicitly
get the name <literal>stored</literal> assigned. Note that if
multiple file descriptors are submitted at once the specified
get the name <literal>stored</literal> assigned. Note that, if
multiple file descriptors are submitted at once, the specified
name will be assigned to all of them. In order to assign
different names to submitted file descriptors, submit them in
seperate invocations of
<function>sd_pid_notify_with_fds()</function>. The name may
consist of any ASCII characters, but must not contain control
consist of any ASCII character, but must not contain control
characters or <literal>:</literal>. It may not be longer than
255 characters. If a submitted name does not follow these
restrictions it is ignored.</para></listitem>
restrictions, it is ignored.</para></listitem>
</varlistentry>
</variablelist>
@ -274,7 +274,7 @@
use as originating PID for the message as first argument. This is
useful to send notification messages on behalf of other processes,
provided the appropriate privileges are available. If the PID
argument is specified as 0 the process ID of the calling process
argument is specified as 0, the process ID of the calling process
is used, in which case the calls are fully equivalent to
<function>sd_notify()</function> and
<function>sd_notifyf()</function>.</para>
@ -311,7 +311,7 @@
<xi:include href="libsystemd-pkgconfig.xml" xpointer="pkgconfig-text"/>
<para>Internally, these functions send a single datagram with the
<para>These functions send a single datagram with the
state string as payload to the <constant>AF_UNIX</constant> socket
referenced in the <varname>$NOTIFY_SOCKET</varname> environment
variable. If the first character of
@ -377,7 +377,7 @@
<para>To store an open file descriptor in the service manager,
in order to continue operation after a service restart without
losing state use <literal>FDSTORE=1</literal>:</para>
losing state, use <literal>FDSTORE=1</literal>:</para>
<programlisting>sd_pid_notify_with_fds(0, 0, "FDSTORE=1\nFDNAME=foobar", &amp;fd, 1);</programlisting>
</example>

View File

@ -176,7 +176,7 @@
not all processes are part of a login session (e.g. system service
processes, user processes that are shared between multiple
sessions of the same user, or kernel threads). For processes not
being part of a login session this function will fail with
being part of a login session, this function will fail with
-ENODATA. The returned string needs to be freed with the libc
<citerefentry
project='man-pages'><refentrytitle>free</refentrytitle><manvolnum>3</manvolnum></citerefentry>
@ -188,8 +188,8 @@
unit name is a short string, suitable for usage in file system
paths. Note that not all processes are part of a system
unit/service (e.g. user processes, or kernel threads). For
processes not being part of a systemd system unit this function
will fail with -ENODATA (More specifically: this call will not
processes not being part of a systemd system unit, this function
will fail with -ENODATA. (More specifically, this call will not
work for kernel threads.) The returned string needs to be freed
with the libc <citerefentry
project='man-pages'><refentrytitle>free</refentrytitle><manvolnum>3</manvolnum></citerefentry>
@ -198,17 +198,17 @@
<para><function>sd_pid_get_user_unit()</function> may be used to
determine the systemd user unit (i.e. user service or scope unit)
identifier of a process identified by the specified PID. This is
similar to <function>sd_pid_get_unit()</function> but applies to
similar to <function>sd_pid_get_unit()</function>, but applies to
user units instead of system units.</para>
<para><function>sd_pid_get_owner_uid()</function> may be used to
determine the Unix UID (user identifier) of the owner of the
session of a process identified the specified PID. Note that this
function will succeed for user processes which are shared between
multiple login sessions of the same user, where
multiple login sessions of the same user, whereas
<function>sd_pid_get_session()</function> will fail. For processes
not being part of a login session and not being a shared process
of a user this function will fail with -ENODATA.</para>
of a user, this function will fail with -ENODATA.</para>
<para><function>sd_pid_get_machine_name()</function> may be used
to determine the name of the VM or container is a member of. The
@ -216,7 +216,7 @@
paths. The returned string needs to be freed with the libc
<citerefentry
project='man-pages'><refentrytitle>free</refentrytitle><manvolnum>3</manvolnum></citerefentry>
call after use. For processes not part of a VM or containers this
call after use. For processes not part of a VM or containers, this
function fails with -ENODATA.</para>
<para><function>sd_pid_get_slice()</function> may be used to
@ -227,7 +227,7 @@
<citerefentry project='man-pages'><refentrytitle>free</refentrytitle><manvolnum>3</manvolnum></citerefentry>
call after use.</para>
<para>Similar, <function>sd_pid_get_user_slice()</function>
<para>Similarly, <function>sd_pid_get_user_slice()</function>
returns the user slice (as managed by the user's systemd instance)
of a process.</para>
@ -235,7 +235,7 @@
group path of the specified process, relative to the root of the
hierarchy. Returns the path without trailing slash, except for
processes located in the root control group, where "/" is
returned. To find the actual control group path in the file system
returned. To find the actual control group path in the file system,
the returned path needs to be prefixed with
<filename>/sys/fs/cgroup/</filename> (if the unified control group
setup is used), or
@ -294,7 +294,7 @@
<varlistentry>
<term><constant>-ENODATA</constant></term>
<listitem><para>Given field is not specified for the described
<listitem><para>The given field is not specified for the described
process or peer.</para>
</listitem>
</varlistentry>
@ -303,7 +303,7 @@
<term><constant>-EINVAL</constant></term>
<listitem><para>An input parameter was invalid (out of range,
or NULL, where that's not accepted).</para></listitem>
or NULL, where that is not accepted).</para></listitem>
</varlistentry>
<varlistentry>

View File

@ -158,7 +158,7 @@
<varlistentry>
<term><constant>-ENODATA</constant></term>
<listitem><para>Given field is not specified for the described
<listitem><para>The given field is not specified for the described
seat.</para>
</listitem>
</varlistentry>
@ -174,7 +174,7 @@
<term><constant>-EINVAL</constant></term>
<listitem><para>An input parameter was invalid (out of range,
or NULL, where that's not accepted).</para></listitem>
or NULL, where that is not accepted).</para></listitem>
</varlistentry>
<varlistentry>

View File

@ -306,7 +306,7 @@
<varlistentry>
<term><constant>-ENODATA</constant></term>
<listitem><para>Given field is not specified for the described
<listitem><para>The given field is not specified for the described
session.</para>
</listitem>
</varlistentry>
@ -315,7 +315,7 @@
<term><constant>-EINVAL</constant></term>
<listitem><para>An input parameter was invalid (out of range,
or NULL, where that's not accepted).</para></listitem>
or NULL, where that is not accepted).</para></listitem>
</varlistentry>
<varlistentry>

View File

@ -179,7 +179,7 @@
<varlistentry>
<term><constant>-ENODATA</constant></term>
<listitem><para>Given field is not specified for the described
<listitem><para>The given field is not specified for the described
user.</para>
</listitem>
</varlistentry>
@ -195,7 +195,7 @@
<term><constant>-EINVAL</constant></term>
<listitem><para>An input parameter was invalid (out of range,
or NULL, where that's not accepted). This is also returned if
or NULL, where that is not accepted). This is also returned if
the passed user ID is 0xFFFF or 0xFFFFFFFF, which are
undefined on Linux.</para></listitem>
</varlistentry>

View File

@ -157,7 +157,7 @@
systemd-41.</para>
<para><function>sd_watchdog_enabled()</function> function was
added in systemd-209. Since that version the
added in systemd-209. Since that version, the
<varname>$WATCHDOG_PID</varname> variable is also set.</para>
</refsect1>

View File

@ -38,9 +38,9 @@
<refsection id='main-conf'>
<title>Configuration Directories and Precedence</title>
<para>Default configuration is defined during compilation, so a
<para>The default configuration is defined during compilation, so a
configuration file is only needed when it is necessary to deviate
from those defaults. By default the configuration file in
from those defaults. By default, the configuration file in
<filename>/etc/systemd/</filename> contains commented out entries
showing the defaults as a guide to the administrator. This file
can be edited to create local overrides.

View File

@ -140,10 +140,10 @@ net.bridge.bridge-nf-call-arptables = 0
</programlisting>
<para>This method applies settings when the module is
loaded. Please note that unless the <filename>br_netfilter</filename>
loaded. Please note that, unless the <filename>br_netfilter</filename>
module is loaded, bridged packets will not be filtered by
netfilter (starting with kernel 3.18), so simply not loading the
module is suffient to avoid filtering.</para>
Netfilter (starting with kernel 3.18), so simply not loading the
module is sufficient to avoid filtering.</para>
</example>
<example>
@ -162,10 +162,10 @@ net.bridge.bridge-nf-call-arptables = 0
</programlisting>
<para>This method forces the module to be always loaded. Please
note that unless the <filename>br_netfilter</filename> module is
loaded, bridged packets will not be filtered with netfilter
note that, unless the <filename>br_netfilter</filename> module is
loaded, bridged packets will not be filtered with Netfilter
(starting with kernel 3.18), so simply not loading the module is
suffient to avoid filtering.</para>
sufficient to avoid filtering.</para>
</example>
</refsect1>

View File

@ -103,7 +103,7 @@
<listitem>
<para>The argument should be a comma-separated list of unit
LOAD, SUB, or ACTIVE states. When listing units, show only
those in specified states. Use <option>--state=failed</option>
those in the specified states. Use <option>--state=failed</option>
to show only failed units.</para>
<para>As a special case, if one of the arguments is
@ -134,7 +134,7 @@
<para>Properties for units vary by unit type, so showing any
unit (even a non-existent one) is a way to list properties
pertaining to this type. Similarly showing any job will list
pertaining to this type. Similarly, showing any job will list
properties pertaining to all jobs. Properties for units are
documented in
<citerefentry><refentrytitle>systemd.unit</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
@ -179,7 +179,6 @@
<command>list-dependencies</command>, i.e. follow
dependencies of type <varname>WantedBy=</varname>,
<varname>RequiredBy=</varname>,
<varname>RequiredByOverridable=</varname>,
<varname>PartOf=</varname>, <varname>BoundBy=</varname>,
instead of <varname>Wants=</varname> and similar.
</para>
@ -359,7 +358,7 @@
<!-- we do not document -failed here, as it has been made
redundant by -state=failed, which it predates. To keep
things simple we only document the new switch, while
things simple, we only document the new switch, while
keeping the old one around for compatibility only. -->
<varlistentry>
@ -458,7 +457,7 @@
<listitem>
<para>When used with <command>kill</command>, choose which
signal to send to selected processes. Must be one of the
well known signal specifiers such as <constant>SIGTERM</constant>, <constant>SIGINT</constant> or
well-known signal specifiers such as <constant>SIGTERM</constant>, <constant>SIGINT</constant> or
<constant>SIGSTOP</constant>. If omitted, defaults to
<option>SIGTERM</option>.</para>
</listitem>
@ -518,7 +517,7 @@
<listitem>
<para>When used with
<command>enable</command>/<command>disable</command>/<command>is-enabled</command>
(and related commands), use alternative root path when
(and related commands), use an alternate root path when
looking for unit files.</para>
</listitem>
@ -600,7 +599,9 @@
<listitem>
<para>When used with <command>list-dependencies</command>,
the output is printed as a list instead of a tree.</para>
<command>list-units</command> or <command>list-machines</command>, the
the output is printed as a list instead of a tree, and the bullet
circles are omitted.</para>
</listitem>
</varlistentry>
@ -829,7 +830,7 @@ kobject-uevent 1 systemd-udevd-kernel.socket systemd-udevd.service
<para>This function is intended to generate human-readable
output. If you are looking for computer-parsable output,
use <command>show</command> instead. By default this
use <command>show</command> instead. By default, this
function only shows 10 lines of output and ellipsizes
lines to fit in the terminal window. This can be changes
with <option>--lines</option> and <option>--full</option>,
@ -849,7 +850,7 @@ kobject-uevent 1 systemd-udevd-kernel.socket systemd-udevd.service
<para>Show properties of one or more units, jobs, or the
manager itself. If no argument is specified, properties of
the manager will be shown. If a unit name is specified,
properties of the unit is shown, and if a job id is
properties of the unit is shown, and if a job ID is
specified, properties of the job is shown. By default, empty
properties are suppressed. Use <option>--all</option> to
show those too. To select specific properties to show, use
@ -930,9 +931,7 @@ kobject-uevent 1 systemd-udevd-kernel.socket systemd-udevd.service
<para>Shows units required and wanted by the specified
unit. This recursively lists units following the
<varname>Requires=</varname>,
<varname>RequiresOverridable=</varname>,
<varname>Requisite=</varname>,
<varname>RequisiteOverridable=</varname>,
<varname>ConsistsOf=</varname>,
<varname>Wants=</varname>, <varname>BindsTo=</varname>
dependencies. If no unit is specified,
@ -959,10 +958,11 @@ kobject-uevent 1 systemd-udevd-kernel.socket systemd-udevd.service
<term><command>list-unit-files <optional><replaceable>PATTERN...</replaceable></optional></command></term>
<listitem>
<para>List installed unit files. If one or more
<replaceable>PATTERN</replaceable>s are specified, only
units whose filename (just the last component of the path)
matches one of them are shown.</para>
<para>List installed unit files and their enablement state
(as reported by <command>is-enabled</command>). If one or
more <replaceable>PATTERN</replaceable>s are specified,
only units whose filename (just the last component of the
path) matches one of them are shown.</para>
</listitem>
</varlistentry>
@ -981,7 +981,7 @@ kobject-uevent 1 systemd-udevd-kernel.socket systemd-udevd.service
starting any of the units being enabled. If this
is desired, either <option>--now</option> should be used
together with this command, or an additional <command>start</command>
command must be invoked for the unit. Also note that in case of
command must be invoked for the unit. Also note that, in case of
instance enablement, symlinks named the same as instances
are created in the install location, however they all point to the
same template unit file.</para>
@ -1132,7 +1132,7 @@ kobject-uevent 1 systemd-udevd-kernel.socket systemd-udevd.service
<tbody>
<row>
<entry><literal>enabled</literal></entry>
<entry morerows='1'>Enabled through a symlink in <filename>.wants</filename> directory (permanently or just in <filename>/run</filename>).</entry>
<entry morerows='1'>Enabled through a symlink in a <filename>.wants/</filename> or <filename>.requires/</filename> subdirectory of <filename>/etc/systemd/system/</filename> (persistently) or <filename>/run/systemd/system/</filename> (transiently).</entry>
<entry morerows='1'>0</entry>
</row>
<row>
@ -1140,7 +1140,7 @@ kobject-uevent 1 systemd-udevd-kernel.socket systemd-udevd.service
</row>
<row>
<entry><literal>linked</literal></entry>
<entry morerows='1'>Made available through a symlink to the unit file (permanently or just in <filename>/run</filename>).</entry>
<entry morerows='1'>Made available through one or more symlinks to the unit file (permanently in <filename>/etc/systemd/system/</filename> or transiently in <filename>/run/systemd/system/</filename>), even though the unit file might reside outside of the unit file search path.</entry>
<entry morerows='1'>&gt; 0</entry>
</row>
<row>
@ -1148,7 +1148,7 @@ kobject-uevent 1 systemd-udevd-kernel.socket systemd-udevd.service
</row>
<row>
<entry><literal>masked</literal></entry>
<entry morerows='1'>Disabled entirely (permanently or just in <filename>/run</filename>).</entry>
<entry morerows='1'>Completely disabled, so that any start operation on it fails (permanently in <filename>/etc/systemd/system/</filename> or transiently in <filename>/run/systemd/systemd/</filename>).</entry>
<entry morerows='1'>&gt; 0</entry>
</row>
<row>
@ -1156,17 +1156,22 @@ kobject-uevent 1 systemd-udevd-kernel.socket systemd-udevd.service
</row>
<row>
<entry><literal>static</literal></entry>
<entry>Unit file is not enabled, and has no provisions for enabling in the <literal>[Install]</literal> section.</entry>
<entry>The unit file is not enabled, and has no provisions for enabling in the <literal>[Install]</literal> section.</entry>
<entry>0</entry>
</row>
<row>
<entry><literal>indirect</literal></entry>
<entry>Unit file itself is not enabled, but it has a non-empty <varname>Also=</varname> setting in the <literal>[Install]</literal> section, listing other unit files that might be enabled.</entry>
<entry>The unit file itself is not enabled, but it has a non-empty <varname>Also=</varname> setting in the <literal>[Install]</literal> section, listing other unit files that might be enabled.</entry>
<entry>0</entry>
</row>
<row>
<entry><literal>disabled</literal></entry>
<entry>Unit file is not enabled.</entry>
<entry>Unit file is not enabled, but contains an <literal>[Install]</literal> section with installation instructions.</entry>
<entry>&gt; 0</entry>
</row>
<row>
<entry><literal>bad</literal></entry>
<entry>Unit file is invalid or another error occured. Note that <command>is-enabled</command> will not actually return this state, but print an error message instead. However the unit file listing printed by <command>list-unit-files</command> might show it.</entry>
<entry>&gt; 0</entry>
</row>
</tbody>
@ -1225,12 +1230,12 @@ kobject-uevent 1 systemd-udevd-kernel.socket systemd-udevd.service
<listitem>
<para>Adds <literal>Wants=</literal> or <literal>Requires=</literal>
dependency, respectively, to the specified
dependencies, respectively, to the specified
<replaceable>TARGET</replaceable> for one or more units. </para>
<para>This command honors <option>--system</option>,
<option>--user</option>, <option>--runtime</option> and
<option>--global</option> in a similar way as
<option>--global</option> in a way similar to
<command>enable</command>.</para>
</listitem>
@ -1246,8 +1251,8 @@ kobject-uevent 1 systemd-udevd-kernel.socket systemd-udevd.service
<para>Depending on whether <option>--system</option> (the default),
<option>--user</option>, or <option>--global</option> is specified,
this creates a drop-in file for each unit either for the system,
for the calling user or for all futures logins of all users. Then,
this command creates a drop-in file for each unit either for the system,
for the calling user, or for all futures logins of all users. Then,
the editor (see the "Environment" section below) is invoked on
temporary files which will be written to the real location if the
editor exits successfully.</para>
@ -1259,8 +1264,8 @@ kobject-uevent 1 systemd-udevd-kernel.socket systemd-udevd.service
be made temporarily in <filename>/run</filename> and they will be
lost on the next reboot.</para>
<para>If the temporary file is empty upon exit the modification of
the related unit is canceled</para>
<para>If the temporary file is empty upon exit, the modification of
the related unit is canceled.</para>
<para>After the units have been edited, systemd configuration is
reloaded (in a way that is equivalent to <command>daemon-reload</command>).
@ -1268,7 +1273,7 @@ kobject-uevent 1 systemd-udevd-kernel.socket systemd-udevd.service
<para>Note that this command cannot be used to remotely edit units
and that you cannot temporarily edit units which are in
<filename>/etc</filename> since they take precedence over
<filename>/etc</filename>, since they take precedence over
<filename>/run</filename>.</para>
</listitem>
</varlistentry>
@ -1339,46 +1344,6 @@ kobject-uevent 1 systemd-udevd-kernel.socket systemd-udevd.service
</variablelist>
</refsect2>
<refsect2>
<title>Snapshot Commands</title>
<variablelist>
<varlistentry>
<term><command>snapshot <optional><replaceable>NAME</replaceable></optional></command></term>
<listitem>
<para>Create a snapshot. If a snapshot name is specified,
the new snapshot will be named after it. If none is
specified, an automatic snapshot name is generated. In
either case, the snapshot name used is printed to standard
output, unless <option>--quiet</option> is specified.
</para>
<para>A snapshot refers to a saved state of the systemd
manager. It is implemented itself as a unit that is
generated dynamically with this command and has dependencies
on all units active at the time. At a later time, the user
may return to this state by using the
<command>isolate</command> command on the snapshot unit.
</para>
<para>Snapshots are only useful for saving and restoring
which units are running or are stopped, they do not
save/restore any other state. Snapshots are dynamic and lost
on reboot.</para>
</listitem>
</varlistentry>
<varlistentry>
<term><command>delete <replaceable>PATTERN</replaceable>...</command></term>
<listitem>
<para>Remove a snapshot previously created with
<command>snapshot</command>.</para>
</listitem>
</varlistentry>
</variablelist>
</refsect2>
<refsect2>
<title>Environment Commands</title>
@ -1440,7 +1405,7 @@ kobject-uevent 1 systemd-udevd-kernel.socket systemd-udevd.service
<term><command>daemon-reload</command></term>
<listitem>
<para>Reload systemd manager configuration. This will
<para>Reload the systemd manager configuration. This will
rerun all generators (see
<citerefentry><refentrytitle>systemd.generator</refentrytitle><manvolnum>7</manvolnum></citerefentry>),
reload all unit files, and recreate the entire dependency
@ -1483,7 +1448,7 @@ kobject-uevent 1 systemd-udevd-kernel.socket systemd-udevd.service
maintenance mode, and with no failed services. Failure is
returned otherwise (exit code non-zero). In addition, the
current state is printed in a short string to standard
output, see table below. Use <option>--quiet</option> to
output, see the table below. Use <option>--quiet</option> to
suppress this output.</para>
<table>
@ -1682,7 +1647,7 @@ kobject-uevent 1 systemd-udevd-kernel.socket systemd-udevd.service
<para>Switches to a different root directory and executes a
new system manager process below it. This is intended for
usage in initial RAM disks ("initrd"), and will transition
from the initrd's system manager process (a.k.a "init"
from the initrd's system manager process (a.k.a. "init"
process) to the main system manager process. This call takes two
arguments: the directory that is to become the new root directory, and
the path to the new system manager binary below it to

View File

@ -61,7 +61,7 @@
<title>Description</title>
<para><command>systemd-activate</command> can be used to
launch a socket activated daemon from the command line for
launch a socket-activated daemon from the command line for
testing purposes. It can also be used to launch single instances
of the daemon per connection (inetd-style).
</para>
@ -164,7 +164,7 @@
</example>
<example>
<title>Run a socket activated instance of <citerefentry><refentrytitle>systemd-journal-gatewayd</refentrytitle><manvolnum>8</manvolnum></citerefentry></title>
<title>Run a socket-activated instance of <citerefentry><refentrytitle>systemd-journal-gatewayd</refentrytitle><manvolnum>8</manvolnum></citerefentry></title>
<programlisting>$ /usr/lib/systemd/systemd-activate -l 19531 /usr/lib/systemd/systemd-journal-gatewayd</programlisting>
</example>

View File

@ -178,7 +178,7 @@
<replaceable>TARGET</replaceable></command> changes the current log
target of the <command>systemd</command> daemon to
<replaceable>TARGET</replaceable> (accepts the same values as
<option>--log-target=</option> described in
<option>--log-target=</option>, described in
<citerefentry><refentrytitle>systemd</refentrytitle><manvolnum>1</manvolnum></citerefentry>).</para>
<para><command>systemd-analyze verify</command> will load unit
@ -226,9 +226,7 @@
<varname>After=</varname> or <varname>Before=</varname> are
shown. If <option>--require</option> is passed, only
dependencies of type <varname>Requires=</varname>,
<varname>RequiresOverridable=</varname>,
<varname>Requisite=</varname>,
<varname>RequisiteOverridable=</varname>,
<varname>Wants=</varname> and <varname>Conflicts=</varname>
are shown. If neither is passed, this shows dependencies of
all these types.</para></listitem>

View File

@ -138,9 +138,9 @@
cache for the password. If set, then the tool will try to push
any collected passwords into the kernel keyring of the root
user, as a key of the specified name. If combined with
<option>--accept-cached</option> it will also try to retrieve
the such cached passwords from the key in the kernel keyring
instead of querying the user right-away. By using this option
<option>--accept-cached</option>, it will also try to retrieve
such cached passwords from the key in the kernel keyring
instead of querying the user right away. By using this option,
the kernel keyring may be used as effective cache to avoid
repeatedly asking users for passwords, if there are multiple
objects that may be unlocked with the same password. The
@ -181,7 +181,7 @@
<term><option>--accept-cached</option></term>
<listitem><para>If passed, accept cached passwords, i.e.
passwords previously typed in. </para></listitem>
passwords previously entered.</para></listitem>
</varlistentry>
<varlistentry>

View File

@ -58,8 +58,8 @@
that restores the display backlight brightness at early boot and
saves it at shutdown. On disk, the backlight brightness is stored
in <filename>/var/lib/systemd/backlight/</filename>. During
loading, if udev property <option>ID_BACKLIGHT_CLAMP</option> is
not set to false value, the brightness is clamped to a value of at
loading, if the udev property <option>ID_BACKLIGHT_CLAMP</option> is
not set to false, the brightness is clamped to a value of at
least 1 or 5% of maximum brightness, whichever is greater. This
restriction will be removed when the kernel allows user space to
reliably set a brightness value which does not turn off the

View File

@ -54,7 +54,7 @@
<refsect1>
<title>Description</title>
<para><filename>systemd-binfmt.service</filename> is an early-boot
<para><filename>systemd-binfmt.service</filename> is an early boot
service that registers additional binary formats for executables
in the kernel.</para>

View File

@ -66,7 +66,7 @@
and logging startup information in the background.
</para>
<para>
After collecting a certain amount of data (usually 15-30
After collecting a certain amount of data (usually 1530
seconds, default 20 s) the logging stops and a graph is
generated from the logged information. This graph contains vital
clues as to which resources are being used, in which order, and
@ -114,7 +114,7 @@
<term><emphasis>Started as a standalone program</emphasis></term>
<listitem><para>One can execute
<command>systemd-bootchart</command> as normal application
from the command line. In this mode it is highly recommended
from the command line. In this mode, it is highly recommended
to pass the <option>-r</option> flag in order to not graph the
time elapsed since boot and before systemd-bootchart was
started, as it may result in extremely large graphs. The time
@ -149,7 +149,7 @@
<term><option>--freq <replaceable>f</replaceable></option></term>
<listitem><para>Specify the sample log frequency, a positive
real <replaceable>f</replaceable>, in Hz. Most systems can
cope with values up to 25-50 without creating too much
cope with values up to 2550 without creating too much
overhead.</para></listitem>
</varlistentry>

View File

@ -112,7 +112,7 @@
<citerefentry project='man-pages'><refentrytitle>syslog</refentrytitle><manvolnum>3</manvolnum></citerefentry>.
Defaults to <literal>info</literal>. Note that this simply
controls the default, individual lines may be logged with
different levels if they are prefixed accordingly. For details
different levels if they are prefixed accordingly. For details,
see <option>--level-prefix=</option> below.</para></listitem>
</varlistentry>

View File

@ -154,7 +154,7 @@
<term><option>-r</option></term>
<term><option>--raw</option></term>
<listitem><para>Format byte counts (as in memory usage and IO metrics)
<listitem><para>Format byte counts (as in memory usage and I/O metrics)
with raw numeric values rather than human-readable
numbers.</para></listitem>
</varlistentry>
@ -164,7 +164,7 @@
<term><option>--cpu=time</option></term>
<listitem><para>Controls whether the CPU usage is shown as
percentage or time. By default the CPU usage is shown as
percentage or time. By default, the CPU usage is shown as
percentage. This setting may also be toggled at runtime by
pressing the <keycap>%</keycap> key.</para></listitem>
</varlistentry>
@ -173,8 +173,8 @@
<term><option>-P</option></term>
<listitem><para>Count only userspace processes instead of all
tasks. By default all tasks are counted: each kernel thread
and each userspace thread individually. With this setting
tasks. By default, all tasks are counted: each kernel thread
and each userspace thread individually. With this setting,
kernel threads are excluded from the counting and each
userspace process only counts as one, regardless how many
threads it consists of. This setting may also be toggled at
@ -187,9 +187,9 @@
<term><option>-k</option></term>
<listitem><para>Count only userspace processes and kernel
threads instead of all tasks. By default all tasks are
threads instead of all tasks. By default, all tasks are
counted: each kernel thread and each userspace thread
individually. With this setting kernel threads are included in
individually. With this setting, kernel threads are included in
the counting and each userspace process only counts as on one,
regardless how many threads it consists of. This setting may
also be toggled at runtime by pressing the <keycap>k</keycap>
@ -203,9 +203,9 @@
<listitem><para>Controls whether the number of processes shown
for a control group shall include all processes that are
contained in any of the child control groups as well. Takes a
boolean argument, defaults to <literal>yes</literal>. If
enabled the processes in child control groups are included, if
disabled only the processes in the control group itself are
boolean argument, which defaults to <literal>yes</literal>. If
enabled, the processes in child control groups are included, if
disabled, only the processes in the control group itself are
counted. This setting may also be toggled at runtime by
pressing the <keycap>r</keycap> key. Note that this setting
only applies to process counting, i.e. when the
@ -294,7 +294,7 @@
<term><keycap>i</keycap></term>
<listitem><para>Sort the control groups by path, number of
tasks, CPU load, memory usage, or IO load, respectively. This
tasks, CPU load, memory usage, or I/O load, respectively. This
setting may also be controlled using the
<option>--order=</option> command line
switch.</para></listitem>
@ -343,7 +343,7 @@
excluding processes in child control groups in control group
process counts. This setting may also be controlled using the
<option>--recursive=</option> command line switch. This key is
not available of all tasks are counted, it is only available
not available if all tasks are counted, it is only available
if processes are counted, as enabled with the
<keycap>P</keycap> or <keycap>k</keycap>
keys.</para></listitem>

View File

@ -72,7 +72,7 @@
in <citerefentry project='man-pages'><refentrytitle>core</refentrytitle><manvolnum>5</manvolnum></citerefentry>.
In particular, the coredump will only be processed when the
related resource limits are high enough. For programs started by
<command>systemd</command> those may be set using
<command>systemd</command>, those may be set using
<varname>LimitCore=</varname> (see
<citerefentry><refentrytitle>systemd.exec</refentrytitle><manvolnum>5</manvolnum></citerefentry>).
</para>

View File

@ -111,7 +111,7 @@
system and the initrd.</para>
<para>If /etc/crypttab contains entries with the same UUID,
then the name, keyfile and options specified there will be
used. Otherwise the device will have the name
used. Otherwise, the device will have the name
<literal>luks-UUID</literal>.</para>
<para>If /etc/crypttab exists, only those UUIDs
specified on the kernel command line

View File

@ -70,7 +70,7 @@
directories which contain "drop-in" files with configuration
snippets which augment the main configuration file. "Drop-in"
files can be overridden in the same way by placing files with the
same name in a directory of higher priority (except that in case
same name in a directory of higher priority (except that, in case
of "drop-in" files, both the "drop-in" file name and the name of
the containing directory, which corresponds to the name of the
main configuration file, must match). For a fuller explanation,

View File

@ -22,7 +22,7 @@
-->
<refentry id="systemd-detect-virt"
xmlns:xi="http://www.w3.org/2001/XInclude">
xmlns:xi="http://www.w3.org/2001/XInclude">
<refentryinfo>
<title>systemd-detect-virt</title>
@ -62,7 +62,7 @@
technology and can distinguish full VM virtualization from
container virtualization. <filename>systemd-detect-virt</filename>
exits with a return value of 0 (success) if a virtualization
technology is detected, and non-zero (error) otherwise. By default
technology is detected, and non-zero (error) otherwise. By default,
any type of virtualization is detected, and the options
<option>--container</option> and <option>--vm</option> can be used
to limit what types of virtualization are detected.</para>
@ -81,87 +81,92 @@
<colspec colname="product" />
<thead>
<row>
<entry>Type</entry>
<entry>ID</entry>
<entry>Product</entry>
<entry>Type</entry>
<entry>ID</entry>
<entry>Product</entry>
</row>
</thead>
<tbody>
<row>
<entry morerows="9">VM</entry>
<entry><varname>qemu</varname></entry>
<entry>QEMU software virtualization</entry>
<entry morerows="9">VM</entry>
<entry><varname>qemu</varname></entry>
<entry>QEMU software virtualization</entry>
</row>
<row>
<entry><varname>kvm</varname></entry>
<entry>Linux KVM kernel virtual machine</entry>
<entry><varname>kvm</varname></entry>
<entry>Linux KVM kernel virtual machine</entry>
</row>
<row>
<entry><varname>zvm</varname></entry>
<entry>s390 z/VM</entry>
<entry><varname>zvm</varname></entry>
<entry>s390 z/VM</entry>
</row>
<row>
<entry><varname>vmware</varname></entry>
<entry>VMware Workstation or Server, and related products</entry>
<entry><varname>vmware</varname></entry>
<entry>VMware Workstation or Server, and related products</entry>
</row>
<row>
<entry><varname>microsoft</varname></entry>
<entry>Hyper-V, also known as Viridian or Windows Server Virtualization</entry>
<entry><varname>microsoft</varname></entry>
<entry>Hyper-V, also known as Viridian or Windows Server Virtualization</entry>
</row>
<row>
<entry><varname>oracle</varname></entry>
<entry>Oracle VM VirtualBox (historically marketed by innotek and Sun Microsystems)</entry>
<entry><varname>oracle</varname></entry>
<entry>Oracle VM VirtualBox (historically marketed by innotek and Sun Microsystems)</entry>
</row>
<row>
<entry><varname>xen</varname></entry>
<entry>Xen hypervisor (only domU, not dom0)</entry>
<entry><varname>xen</varname></entry>
<entry>Xen hypervisor (only domU, not dom0)</entry>
</row>
<row>
<entry><varname>bochs</varname></entry>
<entry>Bochs Emulator</entry>
<entry><varname>bochs</varname></entry>
<entry>Bochs Emulator</entry>
</row>
<row>
<entry><varname>uml</varname></entry>
<entry>User-mode Linux</entry>
<entry><varname>uml</varname></entry>
<entry>User-mode Linux</entry>
</row>
<row>
<entry><varname>parallels</varname></entry>
<entry>Parallels Desktop, Parallels Server</entry>
<entry><varname>parallels</varname></entry>
<entry>Parallels Desktop, Parallels Server</entry>
</row>
<row>
<entry morerows="5">container</entry>
<entry><varname>openvz</varname></entry>
<entry>OpenVZ/Virtuozzo</entry>
<entry morerows="5">Container</entry>
<entry><varname>openvz</varname></entry>
<entry>OpenVZ/Virtuozzo</entry>
</row>
<row>
<entry><varname>lxc</varname></entry>
<entry>Linux container implementation by LXC</entry>
<entry><varname>lxc</varname></entry>
<entry>Linux container implementation by LXC</entry>
</row>
<row>
<entry><varname>lxc-libvirt</varname></entry>
<entry>Linux container implementation by libvirt</entry>
<entry><varname>lxc-libvirt</varname></entry>
<entry>Linux container implementation by libvirt</entry>
</row>
<row>
<entry><varname>systemd-nspawn</varname></entry>
<entry>systemd's minimal container implementation, see <citerefentry><refentrytitle>systemd-nspawn</refentrytitle><manvolnum>1</manvolnum></citerefentry></entry>
<entry><varname>systemd-nspawn</varname></entry>
<entry>systemd's minimal container implementation, see <citerefentry><refentrytitle>systemd-nspawn</refentrytitle><manvolnum>1</manvolnum></citerefentry></entry>
</row>
<row>
<entry><varname>docker</varname></entry>
<entry>Docker container manager</entry>
<entry><varname>docker</varname></entry>
<entry>Docker container manager</entry>
</row>
<row>
<entry><varname>rkt</varname></entry>
<entry>rkt app container runtime</entry>
</row>
</tbody>
</tgroup>
@ -196,6 +201,18 @@
hardware virtualization).</para></listitem>
</varlistentry>
<varlistentry>
<term><option>-r</option></term>
<term><option>--chroot</option></term>
<listitem><para>Detect whether invoked in a
<citerefentry><refentrytitle>chroot</refentrytitle><manvolnum>2</manvolnum></citerefentry>
environment. In this mode, no output is written, but the return
value indicates whether the process was invoked in a
<function>chroot()</function>
environment or not.</para></listitem>
</varlistentry>
<varlistentry>
<term><option>-q</option></term>
<term><option>--quiet</option></term>
@ -221,7 +238,8 @@
<title>See Also</title>
<para>
<citerefentry><refentrytitle>systemd</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
<citerefentry><refentrytitle>systemd-nspawn</refentrytitle><manvolnum>1</manvolnum></citerefentry>
<citerefentry><refentrytitle>systemd-nspawn</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
<citerefentry><refentrytitle>chroot</refentrytitle><manvolnum>2</manvolnum></citerefentry>
</para>
</refsect1>

View File

@ -67,11 +67,11 @@
and will process them individually, one after the other. It will
output them separated by spaces to stdout.</para>
<para>By default this command will escape the strings passed,
<para>By default, this command will escape the strings passed,
unless <option>--unescape</option> is passed which results in the
inverse operation being applied. If <option>--mangle</option> a
special mode of escaping is applied instead, which assumes a
string to be already escaped but will escape everything that
inverse operation being applied. If <option>--mangle</option> is given, a
special mode of escaping is applied instead, which assumes the
string is already escaped but will escape everything that
appears obviously non-escaped.</para>
</refsect1>

View File

@ -80,12 +80,12 @@
<listitem><para>The root user's password</para></listitem>
</itemizedlist>
<para>Each of the fields may either be queried interactively from
the users, set non-interactively on the tool's command line, or be
<para>Each of the fields may either be queried interactively by
users, set non-interactively on the tool's command line, or be
copied from a host system that is used to set up the system
image.</para>
<para>If a setting is already initialized it will not be
<para>If a setting is already initialized, it will not be
overwritten and the user will not be prompted for the
setting.</para>
@ -166,10 +166,10 @@
<citerefentry project='die-net'><refentrytitle>shadow</refentrytitle><manvolnum>5</manvolnum></citerefentry>
file. This setting exists in two forms:
<option>--root-password=</option> accepts the password to set
directly on the command line,
directly on the command line, and
<option>--root-password-file=</option> reads it from a file.
Note that it is not recommended specifying passwords on the
command line as other users might be able to see them simply
Note that it is not recommended to specify passwords on the
command line, as other users might be able to see them simply
by invoking
<citerefentry project='die-net'><refentrytitle>ps</refentrytitle><manvolnum>1</manvolnum></citerefentry>.</para></listitem>
</varlistentry>

View File

@ -62,15 +62,15 @@
device that is configured for file system checking.
<filename>systemd-fsck-root.service</filename> is responsible for
file system checks on the root file system, but only if the
root filesystem wasn't checked in the initramfs.
root filesystem was not checked in the initramfs.
<filename>systemd-fsck@.service</filename> is used for all other
file systems and for the root file system in the initramfs.</para>
<para>Those services are started at boot if
<para>These services are started at boot if
<option>passno</option> in <filename>/etc/fstab</filename> for the
file system is set to a value greater than zero. The file system
check for root is performed before the other file systems. Other
file systems may be checked in parallel, except when they are one
file systems may be checked in parallel, except when they are on
the same rotating disk.</para>
<para><filename>systemd-fsck</filename> does not know any details

View File

@ -126,7 +126,7 @@
<varname>mount.usr=</varname> will default to the value set in
<varname>root=</varname>.</para>
<para>Otherwise this parameter defaults to the
<para>Otherwise, this parameter defaults to the
<filename>/usr</filename> entry found in
<filename>/etc/fstab</filename> on the root filesystem.</para>
@ -143,7 +143,7 @@
<varname>mount.usrfstype=</varname> will default to the value
set in <varname>rootfstype=</varname>.</para>
<para>Otherwise this value will be read from the
<para>Otherwise, this value will be read from the
<filename>/usr</filename> entry in
<filename>/etc/fstab</filename> on the root filesystem.</para>
@ -159,7 +159,7 @@
<varname>mount.usrflags=</varname> will default to the value
set in <varname>rootflags=</varname>.</para>
<para>Otherwise this value will be read from the
<para>Otherwise, this value will be read from the
<filename>/usr</filename> entry in
<filename>/etc/fstab</filename> on the root filesystem.</para>

View File

@ -142,7 +142,7 @@
</table>
<para>The <filename>/home</filename> and <filename>/srv</filename>
partitions may be encrypted in LUKS format. In this case a device
partitions may be encrypted in LUKS format. In this case, a device
mapper device is set up under the names
<filename>/dev/mapper/home</filename> and
<filename>/dev/mapper/srv</filename>. Note that this might create
@ -151,8 +151,8 @@
device name.</para>
<para>Mount and automount units for the EFI System Partition (ESP),
mounting it to <filename>/boot</filename> are generated on EFI
systems, where the boot loader communicates the used ESP to the operating
mounting it to <filename>/boot</filename>, are generated on EFI
systems where the boot loader communicates the used ESP to the operating
system. Since this generator creates an automount unit, the mount will
only be activated on-demand, when accessed. On systems where
<filename>/boot</filename> is an explicitly configured mount

Some files were not shown because too many files have changed in this diff Show More