Discussion:
[PATCH 0/2] Using XML entities for paths in manpages
(too old to reply)
Filipe Brandenburger
2015-05-27 09:38:18 UTC
Permalink
As suggested by Martin Pitt, for better support of distros with non-merged /usr.

This doesn't get us 100% there but I'd say it gets us much closer.

I think we still need a new variable for /etc/udev (similar to &pkgsysconfdir;
which is /etc/systemd) though that is not really critical for non-merged /usr.

There are also some general explanations (in files man/hwdb.xml, man/udev.xml
and man/systemd.{link,netdev,network}.xml) which talk of how files in /etc
override those in /usr/lib but we don't really have a great variable for
/usr/lib or /lib vs. /etc, so I'd like to think a little further on how to
solve that particular one...

I hope that's helpful!

Cheers,
Filipe


Filipe Brandenburger (2):
man: generate configured paths in manpages
man: use configured path for mount and umount binaries in manpages

Makefile.am | 2 ++
man/binfmt.d.xml | 5 ++++-
man/bootchart.conf.xml | 17 +++++++++-------
man/bootctl.xml | 5 ++++-
man/bootup.xml | 5 ++++-
man/busctl.xml | 5 ++++-
man/coredump.conf.xml | 11 ++++++----
man/coredumpctl.xml | 5 ++++-
man/crypttab.xml | 5 ++++-
man/daemon.xml | 5 ++++-
man/file-hierarchy.xml | 5 ++++-
man/halt.xml | 5 ++++-
man/hostname.xml | 5 ++++-
man/hostnamectl.xml | 5 ++++-
man/hwdb.xml | 9 ++++++---
man/journal-remote.conf.xml | 11 ++++++----
man/journalctl.xml | 5 ++++-
man/journald.conf.xml | 11 ++++++----
man/kernel-command-line.xml | 5 ++++-
man/kernel-install.xml | 5 ++++-
man/less-variables.xml | 5 ++++-
man/libsystemd-pkgconfig.xml | 5 ++++-
man/locale.conf.xml | 5 ++++-
man/localectl.xml | 5 ++++-
man/localtime.xml | 5 ++++-
man/loginctl.xml | 5 ++++-
man/logind.conf.xml | 11 ++++++----
man/machine-id.xml | 5 ++++-
man/machine-info.xml | 5 ++++-
man/machinectl.xml | 9 ++++++---
man/modules-load.d.xml | 5 ++++-
man/networkctl.xml | 5 ++++-
man/nss-myhostname.xml | 5 ++++-
man/nss-mymachines.xml | 5 ++++-
man/os-release.xml | 5 ++++-
man/pam_systemd.xml | 5 ++++-
man/resolved.conf.xml | 11 ++++++----
man/runlevel.xml | 5 ++++-
man/sd-daemon.xml | 5 ++++-
man/sd-id128.xml | 5 ++++-
man/sd-journal.xml | 5 ++++-
man/sd-login.xml | 5 ++++-
man/sd_booted.xml | 5 ++++-
man/sd_bus_creds_get_pid.xml | 5 ++++-
man/sd_bus_creds_new_from_pid.xml | 5 ++++-
man/sd_bus_default.xml | 5 ++++-
man/sd_bus_error.xml | 5 ++++-
man/sd_bus_message_append.xml | 5 ++++-
man/sd_bus_message_append_array.xml | 5 ++++-
man/sd_bus_message_append_basic.xml | 5 ++++-
man/sd_bus_message_append_string_memfd.xml | 5 ++++-
man/sd_bus_message_append_strv.xml | 5 ++++-
man/sd_bus_message_get_cookie.xml | 5 ++++-
man/sd_bus_message_get_monotonic_usec.xml | 5 ++++-
man/sd_bus_negotiate_fds.xml | 5 ++++-
man/sd_bus_new.xml | 5 ++++-
man/sd_bus_path_encode.xml | 5 ++++-
man/sd_bus_request_name.xml | 5 ++++-
man/sd_event_add_child.xml | 5 ++++-
man/sd_event_add_defer.xml | 5 ++++-
man/sd_event_add_signal.xml | 5 ++++-
man/sd_event_add_time.xml | 5 ++++-
man/sd_event_get_fd.xml | 5 ++++-
man/sd_event_new.xml | 5 ++++-
man/sd_event_run.xml | 5 ++++-
man/sd_event_set_name.xml | 5 ++++-
man/sd_event_wait.xml | 5 ++++-
man/sd_get_seats.xml | 5 ++++-
man/sd_id128_get_machine.xml | 5 ++++-
man/sd_id128_randomize.xml | 5 ++++-
man/sd_id128_to_string.xml | 5 ++++-
man/sd_is_fifo.xml | 5 ++++-
man/sd_journal_add_match.xml | 5 ++++-
man/sd_journal_get_catalog.xml | 5 ++++-
man/sd_journal_get_cursor.xml | 5 ++++-
man/sd_journal_get_cutoff_realtime_usec.xml | 5 ++++-
man/sd_journal_get_data.xml | 5 ++++-
man/sd_journal_get_fd.xml | 5 ++++-
man/sd_journal_get_realtime_usec.xml | 5 ++++-
man/sd_journal_get_usage.xml | 5 ++++-
man/sd_journal_next.xml | 5 ++++-
man/sd_journal_open.xml | 5 ++++-
man/sd_journal_print.xml | 5 ++++-
man/sd_journal_query_unique.xml | 5 ++++-
man/sd_journal_seek_head.xml | 5 ++++-
man/sd_journal_stream_fd.xml | 5 ++++-
man/sd_listen_fds.xml | 5 ++++-
man/sd_login_monitor_new.xml | 5 ++++-
man/sd_machine_get_class.xml | 5 ++++-
man/sd_notify.xml | 5 ++++-
man/sd_pid_get_session.xml | 5 ++++-
man/sd_seat_get_active.xml | 5 ++++-
man/sd_session_is_active.xml | 5 ++++-
man/sd_uid_get_state.xml | 5 ++++-
man/sd_watchdog_enabled.xml | 5 ++++-
man/shutdown.xml | 5 ++++-
man/standard-conf.xml | 9 ++++++---
man/standard-options.xml | 5 ++++-
man/sysctl.d.xml | 7 +++++--
man/systemctl.xml | 9 ++++++---
man/systemd-activate.xml | 11 ++++++----
man/systemd-analyze.xml | 5 ++++-
man/systemd-ask-password-console.service.xml | 5 ++++-
man/systemd-ask-password.xml | 5 ++++-
man/systemd-***@.service.xml | 7 +++++--
man/systemd-binfmt.service.xml | 7 +++++--
man/systemd-bootchart.xml | 13 +++++++-----
man/systemd-bus-proxyd.xml | 7 +++++--
man/systemd-bus-***@.service.xml | 5 ++++-
man/systemd-cat.xml | 5 ++++-
man/systemd-cgls.xml | 5 ++++-
man/systemd-cgtop.xml | 5 ++++-
man/systemd-coredump.xml | 7 +++++--
man/systemd-cryptsetup-generator.xml | 7 +++++--
man/systemd-***@.service.xml | 7 +++++--
man/systemd-debug-generator.xml | 7 +++++--
man/systemd-delta.xml | 5 ++++-
man/systemd-detect-virt.xml | 5 ++++-
man/systemd-efi-boot-generator.xml | 7 +++++--
man/systemd-escape.xml | 5 ++++-
man/systemd-firstboot.xml | 5 ++++-
man/systemd-***@.service.xml | 7 +++++--
man/systemd-fstab-generator.xml | 7 +++++--
man/systemd-getty-generator.xml | 7 +++++--
man/systemd-gpt-auto-generator.xml | 7 +++++--
man/systemd-halt.service.xml | 11 ++++++----
man/systemd-hibernate-resume-generator.xml | 7 +++++--
man/systemd-hibernate-***@.service.xml | 7 +++++--
man/systemd-hostnamed.service.xml | 7 +++++--
man/systemd-hwdb.xml | 7 +++++--
man/systemd-inhibit.xml | 5 ++++-
man/systemd-initctl.service.xml | 7 +++++--
man/systemd-journal-gatewayd.service.xml | 7 +++++--
man/systemd-journal-remote.xml | 5 ++++-
man/systemd-journal-upload.xml | 9 ++++++---
man/systemd-journald.service.xml | 9 ++++++---
man/systemd-localed.service.xml | 7 +++++--
man/systemd-logind.service.xml | 7 +++++--
man/systemd-machine-id-commit.service.xml | 7 +++++--
man/systemd-machine-id-commit.xml | 5 ++++-
man/systemd-machine-id-setup.xml | 5 ++++-
man/systemd-machined.service.xml | 7 +++++--
man/systemd-modules-load.service.xml | 7 +++++--
man/systemd-networkd-wait-online.service.xml | 7 +++++--
man/systemd-networkd.service.xml | 11 ++++++----
man/systemd-notify.xml | 5 ++++-
man/systemd-nspawn.xml | 5 ++++-
man/systemd-path.xml | 5 ++++-
man/systemd-quotacheck.service.xml | 7 +++++--
man/systemd-random-seed.service.xml | 7 +++++--
man/systemd-remount-fs.service.xml | 7 +++++--
man/systemd-resolved.service.xml | 7 +++++--
man/systemd-***@.service.xml | 7 +++++--
man/systemd-run.xml | 5 ++++-
man/systemd-sleep.conf.xml | 13 +++++++-----
man/systemd-socket-proxyd.xml | 9 ++++++---
man/systemd-suspend.service.xml | 13 +++++++-----
man/systemd-sysctl.service.xml | 7 +++++--
man/systemd-system-update-generator.xml | 7 +++++--
man/systemd-system.conf.xml | 17 +++++++++-------
man/systemd-sysusers.xml | 5 ++++-
man/systemd-sysv-generator.xml | 7 +++++--
man/systemd-timedated.service.xml | 7 +++++--
man/systemd-timesyncd.service.xml | 7 +++++--
man/systemd-tmpfiles.xml | 5 ++++-
man/systemd-tty-ask-password-agent.xml | 5 ++++-
man/systemd-udevd.service.xml | 7 +++++--
man/systemd-update-done.service.xml | 7 +++++--
man/systemd-update-utmp.service.xml | 7 +++++--
man/systemd-user-sessions.service.xml | 7 +++++--
man/systemd-vconsole-setup.service.xml | 7 +++++--
man/systemd.automount.xml | 5 ++++-
man/systemd.device.xml | 5 ++++-
man/systemd.exec.xml | 5 ++++-
man/systemd.generator.xml | 4 ++--
man/systemd.journal-fields.xml | 5 ++++-
man/systemd.kill.xml | 5 ++++-
man/systemd.link.xml | 11 ++++++----
man/systemd.mount.xml | 5 ++++-
man/systemd.netdev.xml | 27 ++++++++++++++-----------
man/systemd.network.xml | 25 +++++++++++++----------
man/systemd.path.xml | 5 ++++-
man/systemd.preset.xml | 21 ++++++++++---------
man/systemd.resource-control.xml | 5 ++++-
man/systemd.scope.xml | 5 ++++-
man/systemd.service.xml | 5 ++++-
man/systemd.slice.xml | 5 ++++-
man/systemd.snapshot.xml | 5 ++++-
man/systemd.socket.xml | 5 ++++-
man/systemd.special.xml | 5 ++++-
man/systemd.swap.xml | 5 ++++-
man/systemd.target.xml | 5 ++++-
man/systemd.time.xml | 5 ++++-
man/systemd.timer.xml | 5 ++++-
man/systemd.unit.xml | 30 ++++++++++++++--------------
man/systemd.xml | 7 +++++--
man/sysusers.d.xml | 5 ++++-
man/telinit.xml | 5 ++++-
man/timedatectl.xml | 9 ++++++---
man/timesyncd.conf.xml | 11 ++++++----
man/tmpfiles.d.xml | 5 ++++-
man/udev.conf.xml | 5 ++++-
man/udev.xml | 9 ++++++---
man/udevadm.xml | 5 ++++-
man/user-system-options.xml | 5 ++++-
man/vconsole.conf.xml | 5 ++++-
206 files changed, 973 insertions(+), 362 deletions(-)
--
2.4.1
Filipe Brandenburger
2015-05-27 09:38:20 UTC
Permalink
Export the MOUNT_PATH and UMOUNT_PATH variables as XML entities and use them in
the systemctl.1 manpage instead of hardcoding the path in /usr/bin.

Tested:
- Ran ./configure ac_cv_path_MOUNT_PATH=/bin/mount (same for umount) and
rebuilt the manpages, confirmed that the correct path was in man/systemctl.1
- Rebuilt man/systemd.directives.xml and the man pages derived from it,
confirmed that the correct paths were there as well.
---
Makefile.am | 2 ++
man/systemctl.xml | 4 ++--
2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index d6010c5..98ceb77 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -6505,6 +6505,8 @@ substitutions = \
'|DEBUGTTY=$(DEBUGTTY)|' \
'|KILL=$(KILL)|' \
'|KMOD=$(KMOD)|' \
+ '|MOUNT_PATH=$(MOUNT_PATH)|' \
+ '|UMOUNT_PATH=$(UMOUNT_PATH)|' \
'|MKDIR_P=$(MKDIR_P)|' \
'|QUOTAON=$(QUOTAON)|' \
'|QUOTACHECK=$(QUOTACHECK)|' \
diff --git a/man/systemctl.xml b/man/systemctl.xml
index a2c8a73..35f47de 100644
--- a/man/systemctl.xml
+++ b/man/systemctl.xml
@@ -413,8 +413,8 @@
processes. Not all unit types manage processes of these
types however. For example, for mount units, control processes
are defined (which are the invocations of
- <filename>/usr/bin/mount</filename> and
- <filename>/usr/bin/umount</filename>), but no main process
+ <filename>&MOUNT_PATH;</filename> and
+ <filename>&UMOUNT_PATH;</filename>), but no main process
is defined. If omitted, defaults to
<option>all</option>.</para>
</listitem>
--
2.4.1
Dimitri John Ledkov
2015-05-27 09:52:04 UTC
Permalink
Post by Filipe Brandenburger
Export the MOUNT_PATH and UMOUNT_PATH variables as XML entities and use them in
the systemctl.1 manpage instead of hardcoding the path in /usr/bin.
- Ran ./configure ac_cv_path_MOUNT_PATH=/bin/mount (same for umount) and
rebuilt the manpages, confirmed that the correct path was in man/systemctl.1
- Rebuilt man/systemd.directives.xml and the man pages derived from it,
confirmed that the correct paths were there as well.
+1 from me. Sorry for the change =)))
Post by Filipe Brandenburger
---
Makefile.am | 2 ++
man/systemctl.xml | 4 ++--
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/Makefile.am b/Makefile.am
index d6010c5..98ceb77 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -6505,6 +6505,8 @@ substitutions = \
'|DEBUGTTY=$(DEBUGTTY)|' \
'|KILL=$(KILL)|' \
'|KMOD=$(KMOD)|' \
+ '|MOUNT_PATH=$(MOUNT_PATH)|' \
+ '|UMOUNT_PATH=$(UMOUNT_PATH)|' \
'|MKDIR_P=$(MKDIR_P)|' \
'|QUOTAON=$(QUOTAON)|' \
'|QUOTACHECK=$(QUOTACHECK)|' \
diff --git a/man/systemctl.xml b/man/systemctl.xml
index a2c8a73..35f47de 100644
--- a/man/systemctl.xml
+++ b/man/systemctl.xml
@@ -413,8 +413,8 @@
processes. Not all unit types manage processes of these
types however. For example, for mount units, control processes
are defined (which are the invocations of
- <filename>/usr/bin/mount</filename> and
- <filename>/usr/bin/umount</filename>), but no main process
+ <filename>&MOUNT_PATH;</filename> and
+ <filename>&UMOUNT_PATH;</filename>), but no main process
is defined. If omitted, defaults to
<option>all</option>.</para>
</listitem>
--
2.4.1
_______________________________________________
systemd-devel mailing list
http://lists.freedesktop.org/mailman/listinfo/systemd-devel
--
Regards,

Dimitri.
Pura Vida!

https://clearlinux.org
Open Source Technology Center
Intel Corporation (UK) Ltd. - Co. Reg. #1134945 - Pipers Way, Swindon SN3 1RJ.
systemd github import bot
2015-05-27 10:02:24 UTC
Permalink
Patchset imported to github.
Pull request:
<https://github.com/systemd-devs/systemd/compare/master...systemd-mailing-devs:1432719500-763-3-git-send-email-filbranden%40google.com>

--
Generated by https://github.com/haraldh/mail2git
Filipe Brandenburger
2015-05-27 09:38:19 UTC
Permalink
In particular, use /lib/systemd instead of /usr/lib/systemd in distributions
like Debian which still have not adopted a /usr merge setup.

Use XML entities from man/custom-entities.ent to replace configured paths while
doing XSLT processing of the original XML files. There was precedent of some
files (such as systemd.generator.xml) which were already using this approach.

This addresses most of the (manual) fixes from this patch:
http://anonscm.debian.org/cgit/pkg-systemd/systemd.git/tree/debian/patches/Fix-paths-in-man-pages.patch?h=experimental-220

The idea of using generic XML entities was presented here:
http://lists.freedesktop.org/archives/systemd-devel/2015-May/032240.html

This patch solves almost all the issues, with the exception of:
- Path to /bin/mount and /bin/umount.
- Generic statements about preference of /lib over /etc.

These will be handled separately by follow up patches.

Tested:
- With default configure settings, ran "make install" to two separate
directories and compared the output to confirm they matched exactly.
- Used a set of configure flags including $CONFFLAGS from Debian:
http://anonscm.debian.org/cgit/pkg-systemd/systemd.git/tree/debian/rules
Installed the tree and confirmed the paths use /lib/systemd instead of
/usr/lib/systemd and that no other unexpected differences exist.
- Confirmed that `make distcheck` still passes.
---
man/binfmt.d.xml | 5 ++++-
man/bootchart.conf.xml | 17 +++++++++-------
man/bootctl.xml | 5 ++++-
man/bootup.xml | 5 ++++-
man/busctl.xml | 5 ++++-
man/coredump.conf.xml | 11 ++++++----
man/coredumpctl.xml | 5 ++++-
man/crypttab.xml | 5 ++++-
man/daemon.xml | 5 ++++-
man/file-hierarchy.xml | 5 ++++-
man/halt.xml | 5 ++++-
man/hostname.xml | 5 ++++-
man/hostnamectl.xml | 5 ++++-
man/hwdb.xml | 9 ++++++---
man/journal-remote.conf.xml | 11 ++++++----
man/journalctl.xml | 5 ++++-
man/journald.conf.xml | 11 ++++++----
man/kernel-command-line.xml | 5 ++++-
man/kernel-install.xml | 5 ++++-
man/less-variables.xml | 5 ++++-
man/libsystemd-pkgconfig.xml | 5 ++++-
man/locale.conf.xml | 5 ++++-
man/localectl.xml | 5 ++++-
man/localtime.xml | 5 ++++-
man/loginctl.xml | 5 ++++-
man/logind.conf.xml | 11 ++++++----
man/machine-id.xml | 5 ++++-
man/machine-info.xml | 5 ++++-
man/machinectl.xml | 9 ++++++---
man/modules-load.d.xml | 5 ++++-
man/networkctl.xml | 5 ++++-
man/nss-myhostname.xml | 5 ++++-
man/nss-mymachines.xml | 5 ++++-
man/os-release.xml | 5 ++++-
man/pam_systemd.xml | 5 ++++-
man/resolved.conf.xml | 11 ++++++----
man/runlevel.xml | 5 ++++-
man/sd-daemon.xml | 5 ++++-
man/sd-id128.xml | 5 ++++-
man/sd-journal.xml | 5 ++++-
man/sd-login.xml | 5 ++++-
man/sd_booted.xml | 5 ++++-
man/sd_bus_creds_get_pid.xml | 5 ++++-
man/sd_bus_creds_new_from_pid.xml | 5 ++++-
man/sd_bus_default.xml | 5 ++++-
man/sd_bus_error.xml | 5 ++++-
man/sd_bus_message_append.xml | 5 ++++-
man/sd_bus_message_append_array.xml | 5 ++++-
man/sd_bus_message_append_basic.xml | 5 ++++-
man/sd_bus_message_append_string_memfd.xml | 5 ++++-
man/sd_bus_message_append_strv.xml | 5 ++++-
man/sd_bus_message_get_cookie.xml | 5 ++++-
man/sd_bus_message_get_monotonic_usec.xml | 5 ++++-
man/sd_bus_negotiate_fds.xml | 5 ++++-
man/sd_bus_new.xml | 5 ++++-
man/sd_bus_path_encode.xml | 5 ++++-
man/sd_bus_request_name.xml | 5 ++++-
man/sd_event_add_child.xml | 5 ++++-
man/sd_event_add_defer.xml | 5 ++++-
man/sd_event_add_signal.xml | 5 ++++-
man/sd_event_add_time.xml | 5 ++++-
man/sd_event_get_fd.xml | 5 ++++-
man/sd_event_new.xml | 5 ++++-
man/sd_event_run.xml | 5 ++++-
man/sd_event_set_name.xml | 5 ++++-
man/sd_event_wait.xml | 5 ++++-
man/sd_get_seats.xml | 5 ++++-
man/sd_id128_get_machine.xml | 5 ++++-
man/sd_id128_randomize.xml | 5 ++++-
man/sd_id128_to_string.xml | 5 ++++-
man/sd_is_fifo.xml | 5 ++++-
man/sd_journal_add_match.xml | 5 ++++-
man/sd_journal_get_catalog.xml | 5 ++++-
man/sd_journal_get_cursor.xml | 5 ++++-
man/sd_journal_get_cutoff_realtime_usec.xml | 5 ++++-
man/sd_journal_get_data.xml | 5 ++++-
man/sd_journal_get_fd.xml | 5 ++++-
man/sd_journal_get_realtime_usec.xml | 5 ++++-
man/sd_journal_get_usage.xml | 5 ++++-
man/sd_journal_next.xml | 5 ++++-
man/sd_journal_open.xml | 5 ++++-
man/sd_journal_print.xml | 5 ++++-
man/sd_journal_query_unique.xml | 5 ++++-
man/sd_journal_seek_head.xml | 5 ++++-
man/sd_journal_stream_fd.xml | 5 ++++-
man/sd_listen_fds.xml | 5 ++++-
man/sd_login_monitor_new.xml | 5 ++++-
man/sd_machine_get_class.xml | 5 ++++-
man/sd_notify.xml | 5 ++++-
man/sd_pid_get_session.xml | 5 ++++-
man/sd_seat_get_active.xml | 5 ++++-
man/sd_session_is_active.xml | 5 ++++-
man/sd_uid_get_state.xml | 5 ++++-
man/sd_watchdog_enabled.xml | 5 ++++-
man/shutdown.xml | 5 ++++-
man/standard-conf.xml | 9 ++++++---
man/standard-options.xml | 5 ++++-
man/sysctl.d.xml | 7 +++++--
man/systemctl.xml | 5 ++++-
man/systemd-activate.xml | 11 ++++++----
man/systemd-analyze.xml | 5 ++++-
man/systemd-ask-password-console.service.xml | 5 ++++-
man/systemd-ask-password.xml | 5 ++++-
man/systemd-***@.service.xml | 7 +++++--
man/systemd-binfmt.service.xml | 7 +++++--
man/systemd-bootchart.xml | 13 +++++++-----
man/systemd-bus-proxyd.xml | 7 +++++--
man/systemd-bus-***@.service.xml | 5 ++++-
man/systemd-cat.xml | 5 ++++-
man/systemd-cgls.xml | 5 ++++-
man/systemd-cgtop.xml | 5 ++++-
man/systemd-coredump.xml | 7 +++++--
man/systemd-cryptsetup-generator.xml | 7 +++++--
man/systemd-***@.service.xml | 7 +++++--
man/systemd-debug-generator.xml | 7 +++++--
man/systemd-delta.xml | 5 ++++-
man/systemd-detect-virt.xml | 5 ++++-
man/systemd-efi-boot-generator.xml | 7 +++++--
man/systemd-escape.xml | 5 ++++-
man/systemd-firstboot.xml | 5 ++++-
man/systemd-***@.service.xml | 7 +++++--
man/systemd-fstab-generator.xml | 7 +++++--
man/systemd-getty-generator.xml | 7 +++++--
man/systemd-gpt-auto-generator.xml | 7 +++++--
man/systemd-halt.service.xml | 11 ++++++----
man/systemd-hibernate-resume-generator.xml | 7 +++++--
man/systemd-hibernate-***@.service.xml | 7 +++++--
man/systemd-hostnamed.service.xml | 7 +++++--
man/systemd-hwdb.xml | 7 +++++--
man/systemd-inhibit.xml | 5 ++++-
man/systemd-initctl.service.xml | 7 +++++--
man/systemd-journal-gatewayd.service.xml | 7 +++++--
man/systemd-journal-remote.xml | 5 ++++-
man/systemd-journal-upload.xml | 9 ++++++---
man/systemd-journald.service.xml | 9 ++++++---
man/systemd-localed.service.xml | 7 +++++--
man/systemd-logind.service.xml | 7 +++++--
man/systemd-machine-id-commit.service.xml | 7 +++++--
man/systemd-machine-id-commit.xml | 5 ++++-
man/systemd-machine-id-setup.xml | 5 ++++-
man/systemd-machined.service.xml | 7 +++++--
man/systemd-modules-load.service.xml | 7 +++++--
man/systemd-networkd-wait-online.service.xml | 7 +++++--
man/systemd-networkd.service.xml | 11 ++++++----
man/systemd-notify.xml | 5 ++++-
man/systemd-nspawn.xml | 5 ++++-
man/systemd-path.xml | 5 ++++-
man/systemd-quotacheck.service.xml | 7 +++++--
man/systemd-random-seed.service.xml | 7 +++++--
man/systemd-remount-fs.service.xml | 7 +++++--
man/systemd-resolved.service.xml | 7 +++++--
man/systemd-***@.service.xml | 7 +++++--
man/systemd-run.xml | 5 ++++-
man/systemd-sleep.conf.xml | 13 +++++++-----
man/systemd-socket-proxyd.xml | 9 ++++++---
man/systemd-suspend.service.xml | 13 +++++++-----
man/systemd-sysctl.service.xml | 7 +++++--
man/systemd-system-update-generator.xml | 7 +++++--
man/systemd-system.conf.xml | 17 +++++++++-------
man/systemd-sysusers.xml | 5 ++++-
man/systemd-sysv-generator.xml | 7 +++++--
man/systemd-timedated.service.xml | 7 +++++--
man/systemd-timesyncd.service.xml | 7 +++++--
man/systemd-tmpfiles.xml | 5 ++++-
man/systemd-tty-ask-password-agent.xml | 5 ++++-
man/systemd-udevd.service.xml | 7 +++++--
man/systemd-update-done.service.xml | 7 +++++--
man/systemd-update-utmp.service.xml | 7 +++++--
man/systemd-user-sessions.service.xml | 7 +++++--
man/systemd-vconsole-setup.service.xml | 7 +++++--
man/systemd.automount.xml | 5 ++++-
man/systemd.device.xml | 5 ++++-
man/systemd.exec.xml | 5 ++++-
man/systemd.generator.xml | 4 ++--
man/systemd.journal-fields.xml | 5 ++++-
man/systemd.kill.xml | 5 ++++-
man/systemd.link.xml | 11 ++++++----
man/systemd.mount.xml | 5 ++++-
man/systemd.netdev.xml | 27 ++++++++++++++-----------
man/systemd.network.xml | 25 +++++++++++++----------
man/systemd.path.xml | 5 ++++-
man/systemd.preset.xml | 21 ++++++++++---------
man/systemd.resource-control.xml | 5 ++++-
man/systemd.scope.xml | 5 ++++-
man/systemd.service.xml | 5 ++++-
man/systemd.slice.xml | 5 ++++-
man/systemd.snapshot.xml | 5 ++++-
man/systemd.socket.xml | 5 ++++-
man/systemd.special.xml | 5 ++++-
man/systemd.swap.xml | 5 ++++-
man/systemd.target.xml | 5 ++++-
man/systemd.time.xml | 5 ++++-
man/systemd.timer.xml | 5 ++++-
man/systemd.unit.xml | 30 ++++++++++++++--------------
man/systemd.xml | 7 +++++--
man/sysusers.d.xml | 5 ++++-
man/telinit.xml | 5 ++++-
man/timedatectl.xml | 9 ++++++---
man/timesyncd.conf.xml | 11 ++++++----
man/tmpfiles.d.xml | 5 ++++-
man/udev.conf.xml | 5 ++++-
man/udev.xml | 9 ++++++---
man/udevadm.xml | 5 ++++-
man/user-system-options.xml | 5 ++++-
man/vconsole.conf.xml | 5 ++++-
205 files changed, 969 insertions(+), 360 deletions(-)

diff --git a/man/binfmt.d.xml b/man/binfmt.d.xml
index 5b63cfb..3aa5eb1 100644
--- a/man/binfmt.d.xml
+++ b/man/binfmt.d.xml
@@ -1,6 +1,9 @@
<?xml version="1.0"?>
<!--*-nxml-*-->
-<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
+<!ENTITY % entities SYSTEM "custom-entities.ent" >
+%entities;
+]>
<!--
This file is part of systemd.

diff --git a/man/bootchart.conf.xml b/man/bootchart.conf.xml
index bf6ca0b..b383f6e 100644
--- a/man/bootchart.conf.xml
+++ b/man/bootchart.conf.xml
@@ -1,6 +1,9 @@
<?xml version='1.0'?> <!--*-nxml-*-->
<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
- "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
+ "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
+<!ENTITY % entities SYSTEM "custom-entities.ent" >
+%entities;
+]>

<!--
This file is part of systemd.
@@ -52,17 +55,17 @@
</refnamediv>

<refsynopsisdiv>
- <para><filename>/etc/systemd/bootchart.conf</filename></para>
- <para><filename>/etc/systemd/bootchart.conf.d/*.conf</filename></para>
+ <para><filename>&pkgsysconfdir;/bootchart.conf</filename></para>
+ <para><filename>&pkgsysconfdir;/bootchart.conf.d/*.conf</filename></para>
<para><filename>/run/systemd/bootchart.conf.d/*.conf</filename></para>
- <para><filename>/usr/lib/systemd/bootchart.conf.d/*.conf</filename></para>
+ <para><filename>&rootlibexecdir;/bootchart.conf.d/*.conf</filename></para>
</refsynopsisdiv>

<refsect1>
<title>Description</title>

<para>When starting, systemd-bootchart will read the configuration
- file <filename>/etc/systemd/bootchart.conf</filename>, followed by
+ file <filename>&pkgsysconfdir;/bootchart.conf</filename>, followed by
the files in the <filename>bootchart.conf.d</filename>
directories. These configuration files determine logging
parameters and graph output.</para>
@@ -122,10 +125,10 @@
<term><varname>Init=[path]</varname></term>
<listitem><para>Configures bootchart to run a non-standard
binary instead of
- <filename>/usr/lib/systemd/systemd</filename>. This option is
+ <filename>&rootlibexecdir;/systemd</filename>. This option is
only relevant if bootchart was invoked from the kernel command
line with
- init=/usr/lib/systemd/systemd-bootchart.</para></listitem>
+ init=&rootlibexecdir;/systemd-bootchart.</para></listitem>
</varlistentry>

<varlistentry>
diff --git a/man/bootctl.xml b/man/bootctl.xml
index 63ad939..c7c65aa 100644
--- a/man/bootctl.xml
+++ b/man/bootctl.xml
@@ -1,6 +1,9 @@
<?xml version='1.0'?> <!--*-nxml-*-->
<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
- "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
+ "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
+<!ENTITY % entities SYSTEM "custom-entities.ent" >
+%entities;
+]>

<!--
This file is part of systemd.
diff --git a/man/bootup.xml b/man/bootup.xml
index b92057a..de34a59 100644
--- a/man/bootup.xml
+++ b/man/bootup.xml
@@ -1,6 +1,9 @@
<?xml version='1.0'?> <!--*-nxml-*-->
<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
- "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
+ "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
+<!ENTITY % entities SYSTEM "custom-entities.ent" >
+%entities;
+]>

<!--
This file is part of systemd.
diff --git a/man/busctl.xml b/man/busctl.xml
index 807fc78..08303b4 100644
--- a/man/busctl.xml
+++ b/man/busctl.xml
@@ -1,6 +1,9 @@
<?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">
+"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
+<!ENTITY % entities SYSTEM "custom-entities.ent" >
+%entities;
+]>

<!--
This file is part of systemd.
diff --git a/man/coredump.conf.xml b/man/coredump.conf.xml
index fd54c59..4c65c1c 100644
--- a/man/coredump.conf.xml
+++ b/man/coredump.conf.xml
@@ -1,6 +1,9 @@
<?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">
+ "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
+<!ENTITY % entities SYSTEM "custom-entities.ent" >
+%entities;
+]>

<!--
This file is part of systemd.
@@ -49,10 +52,10 @@
</refnamediv>

<refsynopsisdiv>
- <para><filename>/etc/systemd/coredump.conf</filename></para>
- <para><filename>/etc/systemd/coredump.conf.d/*.conf</filename></para>
+ <para><filename>&pkgsysconfdir;/coredump.conf</filename></para>
+ <para><filename>&pkgsysconfdir;/coredump.conf.d/*.conf</filename></para>
<para><filename>/run/systemd/coredump.conf.d/*.conf</filename></para>
- <para><filename>/usr/lib/systemd/coredump.conf.d/*.conf</filename></para>
+ <para><filename>&rootlibexecdir;/coredump.conf.d/*.conf</filename></para>
</refsynopsisdiv>

<refsect1>
diff --git a/man/coredumpctl.xml b/man/coredumpctl.xml
index efbc655..4bd1a7e 100644
--- a/man/coredumpctl.xml
+++ b/man/coredumpctl.xml
@@ -1,6 +1,9 @@
<?xml version='1.0'?> <!--*-nxml-*-->
<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
- "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
+ "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
+<!ENTITY % entities SYSTEM "custom-entities.ent" >
+%entities;
+]>

<!--
This file is part of systemd.
diff --git a/man/crypttab.xml b/man/crypttab.xml
index d4ff760..d403e71 100644
--- a/man/crypttab.xml
+++ b/man/crypttab.xml
@@ -1,6 +1,9 @@
<?xml version="1.0"?>
<!--*-nxml-*-->
-<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
+<!ENTITY % entities SYSTEM "custom-entities.ent" >
+%entities;
+]>
<!--
This file is part of systemd.

diff --git a/man/daemon.xml b/man/daemon.xml
index a8bbfc0..38d458e 100644
--- a/man/daemon.xml
+++ b/man/daemon.xml
@@ -1,6 +1,9 @@
<?xml version='1.0'?> <!--*-nxml-*-->
<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
- "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
+ "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
+<!ENTITY % entities SYSTEM "custom-entities.ent" >
+%entities;
+]>

<!--
This file is part of systemd.
diff --git a/man/file-hierarchy.xml b/man/file-hierarchy.xml
index 3a5627d..f73a3ed 100644
--- a/man/file-hierarchy.xml
+++ b/man/file-hierarchy.xml
@@ -1,6 +1,9 @@
<?xml version='1.0'?> <!--*-nxml-*-->
<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
- "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
+ "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
+<!ENTITY % entities SYSTEM "custom-entities.ent" >
+%entities;
+]>

<!--
This file is part of systemd.
diff --git a/man/halt.xml b/man/halt.xml
index a06dbd0..f425ebd 100644
--- a/man/halt.xml
+++ b/man/halt.xml
@@ -1,6 +1,9 @@
<?xml version='1.0'?> <!--*-nxml-*-->
<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
- "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
+ "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
+<!ENTITY % entities SYSTEM "custom-entities.ent" >
+%entities;
+]>

<!--
This file is part of systemd.
diff --git a/man/hostname.xml b/man/hostname.xml
index 9688450..34aaca1 100644
--- a/man/hostname.xml
+++ b/man/hostname.xml
@@ -1,6 +1,9 @@
<?xml version='1.0'?> <!--*-nxml-*-->
<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
- "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
+ "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
+<!ENTITY % entities SYSTEM "custom-entities.ent" >
+%entities;
+]>

<!--
This file is part of systemd.
diff --git a/man/hostnamectl.xml b/man/hostnamectl.xml
index b1f0381..9393466 100644
--- a/man/hostnamectl.xml
+++ b/man/hostnamectl.xml
@@ -1,6 +1,9 @@
<?xml version='1.0'?> <!--*-nxml-*-->
<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
- "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
+ "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
+<!ENTITY % entities SYSTEM "custom-entities.ent" >
+%entities;
+]>

<!--
This file is part of systemd.
diff --git a/man/hwdb.xml b/man/hwdb.xml
index 509dab8..b3602ac 100644
--- a/man/hwdb.xml
+++ b/man/hwdb.xml
@@ -1,6 +1,9 @@
<?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">
+ "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
+<!ENTITY % entities SYSTEM "custom-entities.ent" >
+%entities;
+]>

<refentry id="hwdb" conditional="ENABLE_HWDB">
<refentryinfo>
@@ -40,7 +43,7 @@

<refsect1><title>Hardware Database Files</title>
<para>The hwdb files are read from the files located in the
- system hwdb directory <filename>/usr/lib/udev/hwdb.d</filename>,
+ system hwdb directory <filename>&udevlibexecdir;/hwdb.d</filename>,
the volatile runtime directory <filename>/run/udev/hwdb.d</filename>
and the local administration directory <filename>/etc/udev/hwdb.d</filename>.
All hwdb files are collectively sorted and processed in lexical order,
@@ -70,7 +73,7 @@
<para>The content of all hwdb files is read by
<citerefentry><refentrytitle>systemd-hwdb</refentrytitle><manvolnum>8</manvolnum></citerefentry>
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
+ or alternatively <filename>&udevlibexecdir;/hwdb.bin</filename> if you want ship the compiled
database in an immutable image.
During runtime only the binary database is used.</para>
</refsect1>
diff --git a/man/journal-remote.conf.xml b/man/journal-remote.conf.xml
index fc60258..948dfa5 100644
--- a/man/journal-remote.conf.xml
+++ b/man/journal-remote.conf.xml
@@ -1,6 +1,9 @@
<?xml version='1.0'?> <!--*-nxml-*-->
<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
- "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
+ "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
+<!ENTITY % entities SYSTEM "custom-entities.ent" >
+%entities;
+]>

<!--
This file is part of systemd.
@@ -49,10 +52,10 @@
</refnamediv>

<refsynopsisdiv>
- <para><filename>/etc/systemd/journal-remote.conf</filename></para>
- <para><filename>/etc/systemd/journald.conf.d/*.conf</filename></para>
+ <para><filename>&pkgsysconfdir;/journal-remote.conf</filename></para>
+ <para><filename>&pkgsysconfdir;/journald.conf.d/*.conf</filename></para>
<para><filename>/run/systemd/journald.conf.d/*.conf</filename></para>
- <para><filename>/usr/lib/systemd/journald.conf.d/*.conf</filename></para>
+ <para><filename>&rootlibexecdir;/journald.conf.d/*.conf</filename></para>
</refsynopsisdiv>

<refsect1>
diff --git a/man/journalctl.xml b/man/journalctl.xml
index 08de0ff..d67d960 100644
--- a/man/journalctl.xml
+++ b/man/journalctl.xml
@@ -1,6 +1,9 @@
<?xml version='1.0'?> <!--*-nxml-*-->
<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
- "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
+ "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
+<!ENTITY % entities SYSTEM "custom-entities.ent" >
+%entities;
+]>

<!--
This file is part of systemd.
diff --git a/man/journald.conf.xml b/man/journald.conf.xml
index 2cbe58b..8d0dbb0 100644
--- a/man/journald.conf.xml
+++ b/man/journald.conf.xml
@@ -1,6 +1,9 @@
<?xml version='1.0'?> <!--*-nxml-*-->
<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
- "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
+ "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
+<!ENTITY % entities SYSTEM "custom-entities.ent" >
+%entities;
+]>

<!--
This file is part of systemd.
@@ -49,10 +52,10 @@
</refnamediv>

<refsynopsisdiv>
- <para><filename>/etc/systemd/journald.conf</filename></para>
- <para><filename>/etc/systemd/journald.conf.d/*.conf</filename></para>
+ <para><filename>&pkgsysconfdir;/journald.conf</filename></para>
+ <para><filename>&pkgsysconfdir;/journald.conf.d/*.conf</filename></para>
<para><filename>/run/systemd/journald.conf.d/*.conf</filename></para>
- <para><filename>/usr/lib/systemd/journald.conf.d/*.conf</filename></para>
+ <para><filename>&rootlibexecdir;/journald.conf.d/*.conf</filename></para>
</refsynopsisdiv>

<refsect1>
diff --git a/man/kernel-command-line.xml b/man/kernel-command-line.xml
index eb73727..6490123 100644
--- a/man/kernel-command-line.xml
+++ b/man/kernel-command-line.xml
@@ -1,6 +1,9 @@
<?xml version='1.0'?> <!--*-nxml-*-->
<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
- "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
+ "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
+<!ENTITY % entities SYSTEM "custom-entities.ent" >
+%entities;
+]>

<!--
This file is part of systemd.
diff --git a/man/kernel-install.xml b/man/kernel-install.xml
index d7e27de..8891bae 100644
--- a/man/kernel-install.xml
+++ b/man/kernel-install.xml
@@ -1,6 +1,9 @@
<?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">
+"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
+<!ENTITY % entities SYSTEM "custom-entities.ent" >
+%entities;
+]>

<!--
This file is part of systemd.
diff --git a/man/less-variables.xml b/man/less-variables.xml
index 0fb4d7f..e344c62 100644
--- a/man/less-variables.xml
+++ b/man/less-variables.xml
@@ -1,6 +1,9 @@
<?xml version="1.0"?>
<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
- "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
+ "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+<!ENTITY % entities SYSTEM "custom-entities.ent" >
+%entities;
+]>

<refsect1>
<title>Environment</title>
diff --git a/man/libsystemd-pkgconfig.xml b/man/libsystemd-pkgconfig.xml
index 272da64..3620f47 100644
--- a/man/libsystemd-pkgconfig.xml
+++ b/man/libsystemd-pkgconfig.xml
@@ -1,6 +1,9 @@
<?xml version="1.0"?>
<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
- "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
+ "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+<!ENTITY % entities SYSTEM "custom-entities.ent" >
+%entities;
+]>

<refsect1>
<title>Notes</title>
diff --git a/man/locale.conf.xml b/man/locale.conf.xml
index 2c32d16..8af49af 100644
--- a/man/locale.conf.xml
+++ b/man/locale.conf.xml
@@ -1,6 +1,9 @@
<?xml version='1.0'?> <!--*-nxml-*-->
<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
- "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
+ "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
+<!ENTITY % entities SYSTEM "custom-entities.ent" >
+%entities;
+]>

<!--
This file is part of systemd.
diff --git a/man/localectl.xml b/man/localectl.xml
index 7def047..caf963a 100644
--- a/man/localectl.xml
+++ b/man/localectl.xml
@@ -1,6 +1,9 @@
<?xml version='1.0'?> <!--*-nxml-*-->
<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
- "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
+ "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
+<!ENTITY % entities SYSTEM "custom-entities.ent" >
+%entities;
+]>

<!--
This file is part of systemd.
diff --git a/man/localtime.xml b/man/localtime.xml
index 2827da6..1740dde 100644
--- a/man/localtime.xml
+++ b/man/localtime.xml
@@ -1,6 +1,9 @@
<?xml version='1.0'?> <!--*-nxml-*-->
<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
- "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
+ "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
+<!ENTITY % entities SYSTEM "custom-entities.ent" >
+%entities;
+]>

<!--
This file is part of systemd.
diff --git a/man/loginctl.xml b/man/loginctl.xml
index 9dda14d..d0529c1 100644
--- a/man/loginctl.xml
+++ b/man/loginctl.xml
@@ -1,6 +1,9 @@
<?xml version='1.0'?> <!--*-nxml-*-->
<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
- "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
+ "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
+<!ENTITY % entities SYSTEM "custom-entities.ent" >
+%entities;
+]>

<!--
This file is part of systemd.
diff --git a/man/logind.conf.xml b/man/logind.conf.xml
index 2b79547..96ebd6e 100644
--- a/man/logind.conf.xml
+++ b/man/logind.conf.xml
@@ -1,6 +1,9 @@
<?xml version='1.0'?> <!--*-nxml-*-->
<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
- "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
+ "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
+<!ENTITY % entities SYSTEM "custom-entities.ent" >
+%entities;
+]>

<!--
This file is part of systemd.
@@ -49,10 +52,10 @@
</refnamediv>

<refsynopsisdiv>
- <para><filename>/etc/systemd/logind.conf</filename></para>
- <para><filename>/etc/systemd/logind.conf.d/*.conf</filename></para>
+ <para><filename>&pkgsysconfdir;/logind.conf</filename></para>
+ <para><filename>&pkgsysconfdir;/logind.conf.d/*.conf</filename></para>
<para><filename>/run/systemd/logind.conf.d/*.conf</filename></para>
- <para><filename>/usr/lib/systemd/logind.conf.d/*.conf</filename></para>
+ <para><filename>&rootlibexecdir;/logind.conf.d/*.conf</filename></para>
</refsynopsisdiv>

<refsect1>
diff --git a/man/machine-id.xml b/man/machine-id.xml
index 92d67a3..bb7cd7f 100644
--- a/man/machine-id.xml
+++ b/man/machine-id.xml
@@ -1,6 +1,9 @@
<?xml version='1.0'?> <!--*-nxml-*-->
<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
- "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
+ "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
+<!ENTITY % entities SYSTEM "custom-entities.ent" >
+%entities;
+]>

<!--
This file is part of systemd.
diff --git a/man/machine-info.xml b/man/machine-info.xml
index 916f1da..a6db1e0 100644
--- a/man/machine-info.xml
+++ b/man/machine-info.xml
@@ -1,6 +1,9 @@
<?xml version='1.0'?> <!--*-nxml-*-->
<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
- "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
+ "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
+<!ENTITY % entities SYSTEM "custom-entities.ent" >
+%entities;
+]>

<!--
This file is part of systemd.
diff --git a/man/machinectl.xml b/man/machinectl.xml
index 50cbb1b..18ef6a5 100644
--- a/man/machinectl.xml
+++ b/man/machinectl.xml
@@ -1,6 +1,9 @@
<?xml version='1.0'?> <!--*-nxml-*-->
<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
- "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
+ "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
+<!ENTITY % entities SYSTEM "custom-entities.ent" >
+%entities;
+]>

<!--
This file is part of systemd.
@@ -585,8 +588,8 @@
first verified with detached GPG signature file
<filename>SHA256SUMS.gpg</filename>. The public key for this
verification step needs to be available in
- <filename>/usr/lib/systemd/import-pubring.gpg</filename> or
- <filename>/etc/systemd/import-pubring.gpg</filename>.</para>
+ <filename>&rootlibexecdir;/import-pubring.gpg</filename> or
+ <filename>&pkgsysconfdir;/import-pubring.gpg</filename>.</para>

<para>The container image will be downloaded and stored in a
read-only subvolume in
diff --git a/man/modules-load.d.xml b/man/modules-load.d.xml
index 4b722aa..82a98be 100644
--- a/man/modules-load.d.xml
+++ b/man/modules-load.d.xml
@@ -1,6 +1,9 @@
<?xml version="1.0"?>
<!--*-nxml-*-->
-<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
+<!ENTITY % entities SYSTEM "custom-entities.ent" >
+%entities;
+]>
<!--
This file is part of systemd.

diff --git a/man/networkctl.xml b/man/networkctl.xml
index d11d60f..402698c 100644
--- a/man/networkctl.xml
+++ b/man/networkctl.xml
@@ -1,6 +1,9 @@
<?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">
+"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
+<!ENTITY % entities SYSTEM "custom-entities.ent" >
+%entities;
+]>

<!--
This file is part of systemd.
diff --git a/man/nss-myhostname.xml b/man/nss-myhostname.xml
index 2d36df6..7379213 100644
--- a/man/nss-myhostname.xml
+++ b/man/nss-myhostname.xml
@@ -1,6 +1,9 @@
<?xml version='1.0'?> <!--*-nxml-*-->
<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
- "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
+ "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
+<!ENTITY % entities SYSTEM "custom-entities.ent" >
+%entities;
+]>

<!--
This file is part of systemd.
diff --git a/man/nss-mymachines.xml b/man/nss-mymachines.xml
index eb1ed25..a3e6c75 100644
--- a/man/nss-mymachines.xml
+++ b/man/nss-mymachines.xml
@@ -1,6 +1,9 @@
<?xml version='1.0'?> <!--*-nxml-*-->
<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
- "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
+ "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
+<!ENTITY % entities SYSTEM "custom-entities.ent" >
+%entities;
+]>

<!--
This file is part of systemd.
diff --git a/man/os-release.xml b/man/os-release.xml
index 4ca2e59..6ce5885 100644
--- a/man/os-release.xml
+++ b/man/os-release.xml
@@ -1,6 +1,9 @@
<?xml version='1.0'?> <!--*-nxml-*-->
<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
- "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
+ "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
+<!ENTITY % entities SYSTEM "custom-entities.ent" >
+%entities;
+]>

<!--
This file is part of systemd.
diff --git a/man/pam_systemd.xml b/man/pam_systemd.xml
index b4a3f50..6fdbcf9 100644
--- a/man/pam_systemd.xml
+++ b/man/pam_systemd.xml
@@ -1,6 +1,9 @@
<?xml version='1.0'?> <!--*-nxml-*-->
<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
- "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
+ "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
+<!ENTITY % entities SYSTEM "custom-entities.ent" >
+%entities;
+]>

<!--
This file is part of systemd.
diff --git a/man/resolved.conf.xml b/man/resolved.conf.xml
index 8047a4e..52329eb 100644
--- a/man/resolved.conf.xml
+++ b/man/resolved.conf.xml
@@ -1,6 +1,9 @@
<?xml version='1.0'?> <!--*-nxml-*-->
<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
- "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
+ "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
+<!ENTITY % entities SYSTEM "custom-entities.ent" >
+%entities;
+]>

<!--
This file is part of systemd.
@@ -49,10 +52,10 @@
</refnamediv>

<refsynopsisdiv>
- <para><filename>/etc/systemd/resolved.conf</filename></para>
- <para><filename>/etc/systemd/resolved.conf.d/*.conf</filename></para>
+ <para><filename>&pkgsysconfdir;/resolved.conf</filename></para>
+ <para><filename>&pkgsysconfdir;/resolved.conf.d/*.conf</filename></para>
<para><filename>/run/systemd/resolved.conf.d/*.conf</filename></para>
- <para><filename>/usr/lib/systemd/resolved.conf.d/*.conf</filename></para>
+ <para><filename>&rootlibexecdir;/resolved.conf.d/*.conf</filename></para>
</refsynopsisdiv>

<refsect1>
diff --git a/man/runlevel.xml b/man/runlevel.xml
index fc1f523..f34f958 100644
--- a/man/runlevel.xml
+++ b/man/runlevel.xml
@@ -1,6 +1,9 @@
<?xml version='1.0'?> <!--*-nxml-*-->
<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
- "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
+ "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
+<!ENTITY % entities SYSTEM "custom-entities.ent" >
+%entities;
+]>

<!--
This file is part of systemd.
diff --git a/man/sd-daemon.xml b/man/sd-daemon.xml
index b7ba363..686ba0c 100644
--- a/man/sd-daemon.xml
+++ b/man/sd-daemon.xml
@@ -1,6 +1,9 @@
<?xml version='1.0'?> <!--*-nxml-*-->
<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
- "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
+ "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
+<!ENTITY % entities SYSTEM "custom-entities.ent" >
+%entities;
+]>

<!--
This file is part of systemd.
diff --git a/man/sd-id128.xml b/man/sd-id128.xml
index ea79720..067d43b 100644
--- a/man/sd-id128.xml
+++ b/man/sd-id128.xml
@@ -1,6 +1,9 @@
<?xml version='1.0'?> <!--*-nxml-*-->
<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
- "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
+ "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
+<!ENTITY % entities SYSTEM "custom-entities.ent" >
+%entities;
+]>

<!--
This file is part of systemd.
diff --git a/man/sd-journal.xml b/man/sd-journal.xml
index 9b1a522..165284c 100644
--- a/man/sd-journal.xml
+++ b/man/sd-journal.xml
@@ -1,6 +1,9 @@
<?xml version='1.0'?> <!--*-nxml-*-->
<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
- "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
+ "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
+<!ENTITY % entities SYSTEM "custom-entities.ent" >
+%entities;
+]>

<!--
This file is part of systemd.
diff --git a/man/sd-login.xml b/man/sd-login.xml
index 328f711..4c4e5f0 100644
--- a/man/sd-login.xml
+++ b/man/sd-login.xml
@@ -1,6 +1,9 @@
<?xml version='1.0'?> <!--*-nxml-*-->
<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
- "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
+ "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
+<!ENTITY % entities SYSTEM "custom-entities.ent" >
+%entities;
+]>

<!--
This file is part of systemd.
diff --git a/man/sd_booted.xml b/man/sd_booted.xml
index 4dd674b..235e78d 100644
--- a/man/sd_booted.xml
+++ b/man/sd_booted.xml
@@ -1,6 +1,9 @@
<?xml version='1.0'?> <!--*-nxml-*-->
<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
- "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
+ "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
+<!ENTITY % entities SYSTEM "custom-entities.ent" >
+%entities;
+]>

<!--
This file is part of systemd.
diff --git a/man/sd_bus_creds_get_pid.xml b/man/sd_bus_creds_get_pid.xml
index 4debee6..54714de 100644
--- a/man/sd_bus_creds_get_pid.xml
+++ b/man/sd_bus_creds_get_pid.xml
@@ -1,6 +1,9 @@
<?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">
+"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
+<!ENTITY % entities SYSTEM "custom-entities.ent" >
+%entities;
+]>

<!--
This file is part of systemd.
diff --git a/man/sd_bus_creds_new_from_pid.xml b/man/sd_bus_creds_new_from_pid.xml
index 518a95a..695d4e1 100644
--- a/man/sd_bus_creds_new_from_pid.xml
+++ b/man/sd_bus_creds_new_from_pid.xml
@@ -1,6 +1,9 @@
<?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">
+"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
+<!ENTITY % entities SYSTEM "custom-entities.ent" >
+%entities;
+]>

<!--
This file is part of systemd.
diff --git a/man/sd_bus_default.xml b/man/sd_bus_default.xml
index 9db264c..55f1b8b 100644
--- a/man/sd_bus_default.xml
+++ b/man/sd_bus_default.xml
@@ -1,6 +1,9 @@
<?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">
+"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
+<!ENTITY % entities SYSTEM "custom-entities.ent" >
+%entities;
+]>

<!--
This file is part of systemd.
diff --git a/man/sd_bus_error.xml b/man/sd_bus_error.xml
index dc5a93d..bd2a279 100644
--- a/man/sd_bus_error.xml
+++ b/man/sd_bus_error.xml
@@ -1,6 +1,9 @@
<?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">
+"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
+<!ENTITY % entities SYSTEM "custom-entities.ent" >
+%entities;
+]>

<!--
This file is part of systemd.
diff --git a/man/sd_bus_message_append.xml b/man/sd_bus_message_append.xml
index c3bffbd..91a8079 100644
--- a/man/sd_bus_message_append.xml
+++ b/man/sd_bus_message_append.xml
@@ -1,6 +1,9 @@
<?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">
+"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
+<!ENTITY % entities SYSTEM "custom-entities.ent" >
+%entities;
+]>

<!--
This file is part of systemd.
diff --git a/man/sd_bus_message_append_array.xml b/man/sd_bus_message_append_array.xml
index 9490689..5409893 100644
--- a/man/sd_bus_message_append_array.xml
+++ b/man/sd_bus_message_append_array.xml
@@ -1,6 +1,9 @@
<?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">
+"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
+<!ENTITY % entities SYSTEM "custom-entities.ent" >
+%entities;
+]>

<!--
This file is part of systemd.
diff --git a/man/sd_bus_message_append_basic.xml b/man/sd_bus_message_append_basic.xml
index 344b779..81ac6de 100644
--- a/man/sd_bus_message_append_basic.xml
+++ b/man/sd_bus_message_append_basic.xml
@@ -1,6 +1,9 @@
<?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">
+"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
+<!ENTITY % entities SYSTEM "custom-entities.ent" >
+%entities;
+]>

<!--
This file is part of systemd.
diff --git a/man/sd_bus_message_append_string_memfd.xml b/man/sd_bus_message_append_string_memfd.xml
index ea3b7d3..1fecbd5 100644
--- a/man/sd_bus_message_append_string_memfd.xml
+++ b/man/sd_bus_message_append_string_memfd.xml
@@ -1,6 +1,9 @@
<?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">
+"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
+<!ENTITY % entities SYSTEM "custom-entities.ent" >
+%entities;
+]>

<!--
This file is part of systemd.
diff --git a/man/sd_bus_message_append_strv.xml b/man/sd_bus_message_append_strv.xml
index b91406f..d986b06 100644
--- a/man/sd_bus_message_append_strv.xml
+++ b/man/sd_bus_message_append_strv.xml
@@ -1,6 +1,9 @@
<?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">
+"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
+<!ENTITY % entities SYSTEM "custom-entities.ent" >
+%entities;
+]>

<!--
This file is part of systemd.
diff --git a/man/sd_bus_message_get_cookie.xml b/man/sd_bus_message_get_cookie.xml
index 02374d7..7795acf 100644
--- a/man/sd_bus_message_get_cookie.xml
+++ b/man/sd_bus_message_get_cookie.xml
@@ -1,6 +1,9 @@
<?xml version='1.0'?> <!--*-nxml-*-->
<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
- "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
+ "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
+<!ENTITY % entities SYSTEM "custom-entities.ent" >
+%entities;
+]>

<!--
This file is part of systemd.
diff --git a/man/sd_bus_message_get_monotonic_usec.xml b/man/sd_bus_message_get_monotonic_usec.xml
index d74aaad..c109fe1 100644
--- a/man/sd_bus_message_get_monotonic_usec.xml
+++ b/man/sd_bus_message_get_monotonic_usec.xml
@@ -1,6 +1,9 @@
<?xml version='1.0'?> <!--*-nxml-*-->
<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
- "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
+ "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
+<!ENTITY % entities SYSTEM "custom-entities.ent" >
+%entities;
+]>

<!--
This file is part of systemd.
diff --git a/man/sd_bus_negotiate_fds.xml b/man/sd_bus_negotiate_fds.xml
index 26a599e..4f9204e 100644
--- a/man/sd_bus_negotiate_fds.xml
+++ b/man/sd_bus_negotiate_fds.xml
@@ -1,6 +1,9 @@
<?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">
+"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
+<!ENTITY % entities SYSTEM "custom-entities.ent" >
+%entities;
+]>

<!--
This file is part of systemd.
diff --git a/man/sd_bus_new.xml b/man/sd_bus_new.xml
index 91ca816..bc91dd2 100644
--- a/man/sd_bus_new.xml
+++ b/man/sd_bus_new.xml
@@ -1,6 +1,9 @@
<?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">
+"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
+<!ENTITY % entities SYSTEM "custom-entities.ent" >
+%entities;
+]>

<!--
This file is part of systemd.
diff --git a/man/sd_bus_path_encode.xml b/man/sd_bus_path_encode.xml
index 69cda53..0a6ac80 100644
--- a/man/sd_bus_path_encode.xml
+++ b/man/sd_bus_path_encode.xml
@@ -1,6 +1,9 @@
<?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">
+"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
+<!ENTITY % entities SYSTEM "custom-entities.ent" >
+%entities;
+]>

<!--
This file is part of systemd.
diff --git a/man/sd_bus_request_name.xml b/man/sd_bus_request_name.xml
index 6aa132b..78b440b 100644
--- a/man/sd_bus_request_name.xml
+++ b/man/sd_bus_request_name.xml
@@ -1,6 +1,9 @@
<?xml version='1.0'?> <!--*-nxml-*-->
<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
- "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
+ "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
+<!ENTITY % entities SYSTEM "custom-entities.ent" >
+%entities;
+]>

<!--
This file is part of systemd.
diff --git a/man/sd_event_add_child.xml b/man/sd_event_add_child.xml
index 640d4b1..7de9f40 100644
--- a/man/sd_event_add_child.xml
+++ b/man/sd_event_add_child.xml
@@ -1,6 +1,9 @@
<?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">
+"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
+<!ENTITY % entities SYSTEM "custom-entities.ent" >
+%entities;
+]>

<!--
This file is part of systemd.
diff --git a/man/sd_event_add_defer.xml b/man/sd_event_add_defer.xml
index dd5d19b..4aabc07 100644
--- a/man/sd_event_add_defer.xml
+++ b/man/sd_event_add_defer.xml
@@ -1,6 +1,9 @@
<?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">
+"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
+<!ENTITY % entities SYSTEM "custom-entities.ent" >
+%entities;
+]>

<!--
This file is part of systemd.
diff --git a/man/sd_event_add_signal.xml b/man/sd_event_add_signal.xml
index ca9c4b9..e84d5c7 100644
--- a/man/sd_event_add_signal.xml
+++ b/man/sd_event_add_signal.xml
@@ -1,6 +1,9 @@
<?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">
+"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
+<!ENTITY % entities SYSTEM "custom-entities.ent" >
+%entities;
+]>

<!--
This file is part of systemd.
diff --git a/man/sd_event_add_time.xml b/man/sd_event_add_time.xml
index 5692ee6..3c5de48 100644
--- a/man/sd_event_add_time.xml
+++ b/man/sd_event_add_time.xml
@@ -1,6 +1,9 @@
<?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">
+"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
+<!ENTITY % entities SYSTEM "custom-entities.ent" >
+%entities;
+]>

<!--
This file is part of systemd.
diff --git a/man/sd_event_get_fd.xml b/man/sd_event_get_fd.xml
index 332e729..8f74c1e 100644
--- a/man/sd_event_get_fd.xml
+++ b/man/sd_event_get_fd.xml
@@ -1,6 +1,9 @@
<?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">
+"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
+<!ENTITY % entities SYSTEM "custom-entities.ent" >
+%entities;
+]>

<!--
This file is part of systemd.
diff --git a/man/sd_event_new.xml b/man/sd_event_new.xml
index 854a887..d225330 100644
--- a/man/sd_event_new.xml
+++ b/man/sd_event_new.xml
@@ -1,6 +1,9 @@
<?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">
+"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
+<!ENTITY % entities SYSTEM "custom-entities.ent" >
+%entities;
+]>

<!--
This file is part of systemd.
diff --git a/man/sd_event_run.xml b/man/sd_event_run.xml
index ac78d35..036887d 100644
--- a/man/sd_event_run.xml
+++ b/man/sd_event_run.xml
@@ -1,6 +1,9 @@
<?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">
+"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
+<!ENTITY % entities SYSTEM "custom-entities.ent" >
+%entities;
+]>

<!--
This file is part of systemd.
diff --git a/man/sd_event_set_name.xml b/man/sd_event_set_name.xml
index 3584b22..0b46414 100644
--- a/man/sd_event_set_name.xml
+++ b/man/sd_event_set_name.xml
@@ -1,6 +1,9 @@
<?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">
+"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
+<!ENTITY % entities SYSTEM "custom-entities.ent" >
+%entities;
+]>

<!--
This file is part of systemd.
diff --git a/man/sd_event_wait.xml b/man/sd_event_wait.xml
index 835cc5d..db74a96 100644
--- a/man/sd_event_wait.xml
+++ b/man/sd_event_wait.xml
@@ -1,6 +1,9 @@
<?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">
+"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
+<!ENTITY % entities SYSTEM "custom-entities.ent" >
+%entities;
+]>

<!--
This file is part of systemd.
diff --git a/man/sd_get_seats.xml b/man/sd_get_seats.xml
index 4390d36..3f2c666 100644
--- a/man/sd_get_seats.xml
+++ b/man/sd_get_seats.xml
@@ -1,6 +1,9 @@
<?xml version='1.0'?> <!--*-nxml-*-->
<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
- "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
+ "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
+<!ENTITY % entities SYSTEM "custom-entities.ent" >
+%entities;
+]>

<!--
This file is part of systemd.
diff --git a/man/sd_id128_get_machine.xml b/man/sd_id128_get_machine.xml
index 2ad1f8f..02fa2da 100644
--- a/man/sd_id128_get_machine.xml
+++ b/man/sd_id128_get_machine.xml
@@ -1,6 +1,9 @@
<?xml version='1.0'?> <!--*-nxml-*-->
<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
- "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
+ "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
+<!ENTITY % entities SYSTEM "custom-entities.ent" >
+%entities;
+]>

<!--
This file is part of systemd.
diff --git a/man/sd_id128_randomize.xml b/man/sd_id128_randomize.xml
index ab449d2..c4d7c42 100644
--- a/man/sd_id128_randomize.xml
+++ b/man/sd_id128_randomize.xml
@@ -1,6 +1,9 @@
<?xml version='1.0'?> <!--*-nxml-*-->
<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
- "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
+ "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
+<!ENTITY % entities SYSTEM "custom-entities.ent" >
+%entities;
+]>

<!--
This file is part of systemd.
diff --git a/man/sd_id128_to_string.xml b/man/sd_id128_to_string.xml
index e70c808..988a646 100644
--- a/man/sd_id128_to_string.xml
+++ b/man/sd_id128_to_string.xml
@@ -1,6 +1,9 @@
<?xml version='1.0'?> <!--*-nxml-*-->
<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
- "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
+ "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
+<!ENTITY % entities SYSTEM "custom-entities.ent" >
+%entities;
+]>

<!--
This file is part of systemd.
diff --git a/man/sd_is_fifo.xml b/man/sd_is_fifo.xml
index 627cb87..57dd6af 100644
--- a/man/sd_is_fifo.xml
+++ b/man/sd_is_fifo.xml
@@ -1,6 +1,9 @@
<?xml version='1.0'?> <!--*-nxml-*-->
<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
- "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
+ "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
+<!ENTITY % entities SYSTEM "custom-entities.ent" >
+%entities;
+]>

<!--
This file is part of systemd.
diff --git a/man/sd_journal_add_match.xml b/man/sd_journal_add_match.xml
index 420f563..fe89cbf 100644
--- a/man/sd_journal_add_match.xml
+++ b/man/sd_journal_add_match.xml
@@ -1,6 +1,9 @@
<?xml version='1.0'?> <!--*-nxml-*-->
<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
- "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
+ "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
+<!ENTITY % entities SYSTEM "custom-entities.ent" >
+%entities;
+]>

<!--
This file is part of systemd.
diff --git a/man/sd_journal_get_catalog.xml b/man/sd_journal_get_catalog.xml
index c19eb11..2ff3fc2 100644
--- a/man/sd_journal_get_catalog.xml
+++ b/man/sd_journal_get_catalog.xml
@@ -1,6 +1,9 @@
<?xml version='1.0'?> <!--*-nxml-*-->
<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
- "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
+ "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
+<!ENTITY % entities SYSTEM "custom-entities.ent" >
+%entities;
+]>

<!--
This file is part of systemd.
diff --git a/man/sd_journal_get_cursor.xml b/man/sd_journal_get_cursor.xml
index a400d8b..1d38bac 100644
--- a/man/sd_journal_get_cursor.xml
+++ b/man/sd_journal_get_cursor.xml
@@ -1,6 +1,9 @@
<?xml version='1.0'?> <!--*-nxml-*-->
<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
- "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
+ "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
+<!ENTITY % entities SYSTEM "custom-entities.ent" >
+%entities;
+]>

<!--
This file is part of systemd.
diff --git a/man/sd_journal_get_cutoff_realtime_usec.xml b/man/sd_journal_get_cutoff_realtime_usec.xml
index 23e7cc6..ae5e638 100644
--- a/man/sd_journal_get_cutoff_realtime_usec.xml
+++ b/man/sd_journal_get_cutoff_realtime_usec.xml
@@ -1,6 +1,9 @@
<?xml version='1.0'?> <!--*-nxml-*-->
<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
- "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
+ "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
+<!ENTITY % entities SYSTEM "custom-entities.ent" >
+%entities;
+]>

<!--
This file is part of systemd.
diff --git a/man/sd_journal_get_data.xml b/man/sd_journal_get_data.xml
index 1afbd73..b395fe0 100644
--- a/man/sd_journal_get_data.xml
+++ b/man/sd_journal_get_data.xml
@@ -1,6 +1,9 @@
<?xml version='1.0'?> <!--*-nxml-*-->
<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
- "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
+ "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
+<!ENTITY % entities SYSTEM "custom-entities.ent" >
+%entities;
+]>

<!--
This file is part of systemd.
diff --git a/man/sd_journal_get_fd.xml b/man/sd_journal_get_fd.xml
index 3a38f73..51dcb1a 100644
--- a/man/sd_journal_get_fd.xml
+++ b/man/sd_journal_get_fd.xml
@@ -1,6 +1,9 @@
<?xml version='1.0'?> <!--*-nxml-*-->
<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
- "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
+ "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
+<!ENTITY % entities SYSTEM "custom-entities.ent" >
+%entities;
+]>

<!--
This file is part of systemd.
diff --git a/man/sd_journal_get_realtime_usec.xml b/man/sd_journal_get_realtime_usec.xml
index 607d746..921aa77 100644
--- a/man/sd_journal_get_realtime_usec.xml
+++ b/man/sd_journal_get_realtime_usec.xml
@@ -1,6 +1,9 @@
<?xml version='1.0'?> <!--*-nxml-*-->
<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
- "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
+ "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
+<!ENTITY % entities SYSTEM "custom-entities.ent" >
+%entities;
+]>

<!--
This file is part of systemd.
diff --git a/man/sd_journal_get_usage.xml b/man/sd_journal_get_usage.xml
index 72c804d..a89b779 100644
--- a/man/sd_journal_get_usage.xml
+++ b/man/sd_journal_get_usage.xml
@@ -1,6 +1,9 @@
<?xml version='1.0'?> <!--*-nxml-*-->
<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
- "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
+ "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
+<!ENTITY % entities SYSTEM "custom-entities.ent" >
+%entities;
+]>

<!--
This file is part of systemd.
diff --git a/man/sd_journal_next.xml b/man/sd_journal_next.xml
index 115fe26..216d9a5 100644
--- a/man/sd_journal_next.xml
+++ b/man/sd_journal_next.xml
@@ -1,6 +1,9 @@
<?xml version='1.0'?> <!--*-nxml-*-->
<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
- "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
+ "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
+<!ENTITY % entities SYSTEM "custom-entities.ent" >
+%entities;
+]>

<!--
This file is part of systemd.
diff --git a/man/sd_journal_open.xml b/man/sd_journal_open.xml
index fb57280..f6aac75 100644
--- a/man/sd_journal_open.xml
+++ b/man/sd_journal_open.xml
@@ -1,6 +1,9 @@
<?xml version='1.0'?> <!--*-nxml-*-->
<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
- "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
+ "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
+<!ENTITY % entities SYSTEM "custom-entities.ent" >
+%entities;
+]>

<!--
This file is part of systemd.
diff --git a/man/sd_journal_print.xml b/man/sd_journal_print.xml
index 0cd0b45..6dbf73f 100644
--- a/man/sd_journal_print.xml
+++ b/man/sd_journal_print.xml
@@ -1,6 +1,9 @@
<?xml version='1.0'?> <!--*-nxml-*-->
<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
- "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
+ "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
+<!ENTITY % entities SYSTEM "custom-entities.ent" >
+%entities;
+]>

<!--
This file is part of systemd.
diff --git a/man/sd_journal_query_unique.xml b/man/sd_journal_query_unique.xml
index ac0e5f6..5c92f89 100644
--- a/man/sd_journal_query_unique.xml
+++ b/man/sd_journal_query_unique.xml
@@ -1,6 +1,9 @@
<?xml version='1.0'?> <!--*-nxml-*-->
<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
- "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
+ "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
+<!ENTITY % entities SYSTEM "custom-entities.ent" >
+%entities;
+]>

<!--
This file is part of systemd.
diff --git a/man/sd_journal_seek_head.xml b/man/sd_journal_seek_head.xml
index d74c2d5..d4c13c2 100644
--- a/man/sd_journal_seek_head.xml
+++ b/man/sd_journal_seek_head.xml
@@ -1,6 +1,9 @@
<?xml version='1.0'?> <!--*-nxml-*-->
<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
- "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
+ "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
+<!ENTITY % entities SYSTEM "custom-entities.ent" >
+%entities;
+]>

<!--
This file is part of systemd.
diff --git a/man/sd_journal_stream_fd.xml b/man/sd_journal_stream_fd.xml
index 2ea7731..ae7990e 100644
--- a/man/sd_journal_stream_fd.xml
+++ b/man/sd_journal_stream_fd.xml
@@ -1,6 +1,9 @@
<?xml version='1.0'?> <!--*-nxml-*-->
<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
- "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
+ "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
+<!ENTITY % entities SYSTEM "custom-entities.ent" >
+%entities;
+]>

<!--
This file is part of systemd.
diff --git a/man/sd_listen_fds.xml b/man/sd_listen_fds.xml
index 9b9705e..38e159b 100644
--- a/man/sd_listen_fds.xml
+++ b/man/sd_listen_fds.xml
@@ -1,6 +1,9 @@
<?xml version='1.0'?> <!--*-nxml-*-->
<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
- "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
+ "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
+<!ENTITY % entities SYSTEM "custom-entities.ent" >
+%entities;
+]>

<!--
This file is part of systemd.
diff --git a/man/sd_login_monitor_new.xml b/man/sd_login_monitor_new.xml
index a7b47a3..ef97dae 100644
--- a/man/sd_login_monitor_new.xml
+++ b/man/sd_login_monitor_new.xml
@@ -1,6 +1,9 @@
<?xml version='1.0'?> <!--*-nxml-*-->
<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
- "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
+ "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
+<!ENTITY % entities SYSTEM "custom-entities.ent" >
+%entities;
+]>

<!--
This file is part of systemd.
diff --git a/man/sd_machine_get_class.xml b/man/sd_machine_get_class.xml
index 5b881cc..68babd1 100644
--- a/man/sd_machine_get_class.xml
+++ b/man/sd_machine_get_class.xml
@@ -1,6 +1,9 @@
<?xml version='1.0'?> <!--*-nxml-*-->
<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
- "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
+ "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
+<!ENTITY % entities SYSTEM "custom-entities.ent" >
+%entities;
+]>

<!--
This file is part of systemd.
diff --git a/man/sd_notify.xml b/man/sd_notify.xml
index 87e59c9..d563bcf 100644
--- a/man/sd_notify.xml
+++ b/man/sd_notify.xml
@@ -1,6 +1,9 @@
<?xml version='1.0'?> <!--*-nxml-*-->
<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
- "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
+ "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
+<!ENTITY % entities SYSTEM "custom-entities.ent" >
+%entities;
+]>

<!--
This file is part of systemd.
diff --git a/man/sd_pid_get_session.xml b/man/sd_pid_get_session.xml
index b46d471..05a3961 100644
--- a/man/sd_pid_get_session.xml
+++ b/man/sd_pid_get_session.xml
@@ -1,6 +1,9 @@
<?xml version='1.0'?> <!--*-nxml-*-->
<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
- "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
+ "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
+<!ENTITY % entities SYSTEM "custom-entities.ent" >
+%entities;
+]>

<!--
This file is part of systemd.
diff --git a/man/sd_seat_get_active.xml b/man/sd_seat_get_active.xml
index 3c57ec9..74b4ed5 100644
--- a/man/sd_seat_get_active.xml
+++ b/man/sd_seat_get_active.xml
@@ -1,6 +1,9 @@
<?xml version='1.0'?> <!--*-nxml-*-->
<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
- "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
+ "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
+<!ENTITY % entities SYSTEM "custom-entities.ent" >
+%entities;
+]>

<!--
This file is part of systemd.
diff --git a/man/sd_session_is_active.xml b/man/sd_session_is_active.xml
index 4ca3a6c..e3af2b3 100644
--- a/man/sd_session_is_active.xml
+++ b/man/sd_session_is_active.xml
@@ -1,6 +1,9 @@
<?xml version='1.0'?> <!--*-nxml-*-->
<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
- "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
+ "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
+<!ENTITY % entities SYSTEM "custom-entities.ent" >
+%entities;
+]>

<!--
This file is part of systemd.
diff --git a/man/sd_uid_get_state.xml b/man/sd_uid_get_state.xml
index b158f35..18a3427 100644
--- a/man/sd_uid_get_state.xml
+++ b/man/sd_uid_get_state.xml
@@ -1,6 +1,9 @@
<?xml version='1.0'?> <!--*-nxml-*-->
<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
- "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
+ "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
+<!ENTITY % entities SYSTEM "custom-entities.ent" >
+%entities;
+]>

<!--
This file is part of systemd.
diff --git a/man/sd_watchdog_enabled.xml b/man/sd_watchdog_enabled.xml
index 991431f..4185010 100644
--- a/man/sd_watchdog_enabled.xml
+++ b/man/sd_watchdog_enabled.xml
@@ -1,6 +1,9 @@
<?xml version='1.0'?> <!--*-nxml-*-->
<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
- "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
+ "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
+<!ENTITY % entities SYSTEM "custom-entities.ent" >
+%entities;
+]>

<!--
This file is part of systemd.
diff --git a/man/shutdown.xml b/man/shutdown.xml
index a8af387..9bf599b 100644
--- a/man/shutdown.xml
+++ b/man/shutdown.xml
@@ -1,6 +1,9 @@
<?xml version='1.0'?> <!--*-nxml-*-->
<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
- "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
+ "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
+<!ENTITY % entities SYSTEM "custom-entities.ent" >
+%entities;
+]>

<!--
This file is part of systemd.
diff --git a/man/standard-conf.xml b/man/standard-conf.xml
index 004f53f..123877a 100644
--- a/man/standard-conf.xml
+++ b/man/standard-conf.xml
@@ -1,6 +1,9 @@
<?xml version="1.0"?> <!--*- Mode: nxml; nxml-child-indent: 2; indent-tabs-mode: nil -*-->
<!DOCTYPE refsection PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
- "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
+ "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+<!ENTITY % entities SYSTEM "custom-entities.ent" >
+%entities;
+]>

<refsection>
<refsection id='confd'>
@@ -39,14 +42,14 @@
<para>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
- <filename>/etc/systemd/</filename> contains commented out entries
+ <filename>&pkgsysconfdir;/</filename> contains commented out entries
showing the defaults as a guide to the administrator. This file
can be edited to create local overrides.
</para>

<para>When packages need to customize the configuration, they can
install configuration snippets in
- <filename>/usr/lib/systemd/*.conf.d/</filename>. Files in
+ <filename>&rootlibexecdir;/*.conf.d/</filename>. Files in
<filename>/etc/</filename> are reserved for the local
administrator, who may use this logic to override the
configuration files installed by vendor packages. The main
diff --git a/man/standard-options.xml b/man/standard-options.xml
index f214463..5adda7c 100644
--- a/man/standard-options.xml
+++ b/man/standard-options.xml
@@ -1,6 +1,9 @@
<?xml version="1.0"?> <!--*- Mode: nxml; nxml-child-indent: 2; indent-tabs-mode: nil -*-->
<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
- "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
+ "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+<!ENTITY % entities SYSTEM "custom-entities.ent" >
+%entities;
+]>

<variablelist>
<varlistentry id='help'>
diff --git a/man/sysctl.d.xml b/man/sysctl.d.xml
index 8a13179..841cedb 100644
--- a/man/sysctl.d.xml
+++ b/man/sysctl.d.xml
@@ -1,5 +1,8 @@
<?xml version="1.0"?> <!--*-nxml-*-->
-<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
+<!ENTITY % entities SYSTEM "custom-entities.ent" >
+%entities;
+]>
<!--
This file is part of systemd.

@@ -127,7 +130,7 @@
<para><filename>/etc/udev/rules.d/99-bridge.rules</filename>:
</para>

- <programlisting>ACTION=="add", SUBSYSTEM=="module", KERNEL=="bridge", RUN+="/usr/lib/systemd/systemd-sysctl --prefix=/net/bridge"
+ <programlisting>ACTION=="add", SUBSYSTEM=="module", KERNEL=="bridge", RUN+="&rootlibexecdir;/systemd-sysctl --prefix=/net/bridge"
</programlisting>

<para><filename>/etc/sysctl.d/bridge.conf</filename>:
diff --git a/man/systemctl.xml b/man/systemctl.xml
index 94a77bc..a2c8a73 100644
--- a/man/systemctl.xml
+++ b/man/systemctl.xml
@@ -1,6 +1,9 @@
<?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">
+"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
+<!ENTITY % entities SYSTEM "custom-entities.ent" >
+%entities;
+]>

<!--
This file is part of systemd.
diff --git a/man/systemd-activate.xml b/man/systemd-activate.xml
index 3b854fd..3aecc40 100644
--- a/man/systemd-activate.xml
+++ b/man/systemd-activate.xml
@@ -1,6 +1,9 @@
<?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">
+"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
+<!ENTITY % entities SYSTEM "custom-entities.ent" >
+%entities;
+]>

<!--
This file is part of systemd.
@@ -50,7 +53,7 @@

<refsynopsisdiv>
<cmdsynopsis>
- <command>/usr/lib/systemd/systemd-activate</command>
+ <command>&rootlibexecdir;/systemd-activate</command>
<arg choice="opt" rep="repeat">OPTIONS</arg>
<arg choice="plain"><replaceable>daemon</replaceable></arg>
<arg choice="opt" rep="repeat">OPTIONS</arg>
@@ -149,13 +152,13 @@
<example>
<title>Run an echo server on port 2000</title>

- <programlisting>$ /usr/lib/systemd/systemd-activate -l 2000 -a cat</programlisting>
+ <programlisting>$ &rootlibexecdir;/systemd-activate -l 2000 -a cat</programlisting>
</example>

<example>
<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>
+ <programlisting>$ &rootlibexecdir;/systemd-activate -l 19531 &rootlibexecdir;/systemd-journal-gatewayd</programlisting>
</example>
</refsect1>

diff --git a/man/systemd-analyze.xml b/man/systemd-analyze.xml
index 1983150..3509d15 100644
--- a/man/systemd-analyze.xml
+++ b/man/systemd-analyze.xml
@@ -1,6 +1,9 @@
<?xml version='1.0'?> <!--*-nxml-*-->
<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
- "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
+ "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
+<!ENTITY % entities SYSTEM "custom-entities.ent" >
+%entities;
+]>

<!--
This file is part of systemd.
diff --git a/man/systemd-ask-password-console.service.xml b/man/systemd-ask-password-console.service.xml
index 479e5f2..488a879 100644
--- a/man/systemd-ask-password-console.service.xml
+++ b/man/systemd-ask-password-console.service.xml
@@ -1,6 +1,9 @@
<?xml version="1.0"?>
<!--*-nxml-*-->
-<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
+<!ENTITY % entities SYSTEM "custom-entities.ent" >
+%entities;
+]>
<!--
This file is part of systemd.

diff --git a/man/systemd-ask-password.xml b/man/systemd-ask-password.xml
index 877c71a..2402103 100644
--- a/man/systemd-ask-password.xml
+++ b/man/systemd-ask-password.xml
@@ -1,6 +1,9 @@
<?xml version='1.0'?> <!--*-nxml-*-->
<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
- "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
+ "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
+<!ENTITY % entities SYSTEM "custom-entities.ent" >
+%entities;
+]>

<!--
This file is part of systemd.
diff --git a/man/systemd-***@.service.xml b/man/systemd-***@.service.xml
index a259f5d..1235762 100644
--- a/man/systemd-***@.service.xml
+++ b/man/systemd-***@.service.xml
@@ -1,6 +1,9 @@
<?xml version="1.0"?>
<!--*-nxml-*-->
-<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
+<!ENTITY % entities SYSTEM "custom-entities.ent" >
+%entities;
+]>
<!--
This file is part of systemd.

@@ -48,7 +51,7 @@

<refsynopsisdiv>
<para><filename>systemd-***@.service</filename></para>
- <para><filename>/usr/lib/systemd/systemd-backlight</filename></para>
+ <para><filename>&rootlibexecdir;/systemd-backlight</filename></para>
</refsynopsisdiv>

<refsect1>
diff --git a/man/systemd-binfmt.service.xml b/man/systemd-binfmt.service.xml
index 66d2643..8659e63 100644
--- a/man/systemd-binfmt.service.xml
+++ b/man/systemd-binfmt.service.xml
@@ -1,6 +1,9 @@
<?xml version="1.0"?>
<!--*-nxml-*-->
-<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
+<!ENTITY % entities SYSTEM "custom-entities.ent" >
+%entities;
+]>
<!--
This file is part of systemd.

@@ -48,7 +51,7 @@

<refsynopsisdiv>
<para><filename>systemd-binfmt.service</filename></para>
- <para><filename>/usr/lib/systemd/systemd-binfmt</filename></para>
+ <para><filename>&rootlibexecdir;/systemd-binfmt</filename></para>
</refsynopsisdiv>

<refsect1>
diff --git a/man/systemd-bootchart.xml b/man/systemd-bootchart.xml
index 5386667..ea8a783 100644
--- a/man/systemd-bootchart.xml
+++ b/man/systemd-bootchart.xml
@@ -1,6 +1,9 @@
<?xml version='1.0'?> <!--*-nxml-*-->
<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
- "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
+ "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
+<!ENTITY % entities SYSTEM "custom-entities.ent" >
+%entities;
+]>

<!--
This file is part of systemd.
@@ -60,7 +63,7 @@
usage, as well as per-process information from a running system.
Collected results are output as an SVG graph. Normally,
systemd-bootchart is invoked by the kernel by passing
- <option>init=<filename>/usr/lib/systemd/systemd-bootchart</filename></option>
+ <option>init=<filename>&rootlibexecdir;/systemd-bootchart</filename></option>
on the kernel command line. systemd-bootchart will then fork the
real init off to resume normal system startup, while monitoring
and logging startup information in the background.
@@ -106,7 +109,7 @@
<listitem><para>The kernel can invoke
<command>systemd-bootchart</command> instead of the init
process. In turn, <command>systemd-bootchart</command> will
- invoke <command>/usr/lib/systemd/systemd</command>.
+ invoke <command>&rootlibexecdir;/systemd</command>.
</para></listitem>
</varlistentry>

@@ -128,7 +131,7 @@
<title>Options</title>

<para>These options can also be set in the
- <filename>/etc/systemd/bootchart.conf</filename> file. See
+ <filename>&pkgsysconfdir;/bootchart.conf</filename> file. See
<citerefentry project='man-pages'><refentrytitle>bootchart.conf</refentrytitle><manvolnum>5</manvolnum></citerefentry>.
</para>

@@ -201,7 +204,7 @@
<term><option>-i</option></term>
<term><option>--init <replaceable>path</replaceable></option></term>
<listitem><para>Use this init binary. Defaults to
- <command>/usr/lib/systemd/systemd</command>.
+ <command>&rootlibexecdir;/systemd</command>.
</para></listitem>
</varlistentry>

diff --git a/man/systemd-bus-proxyd.xml b/man/systemd-bus-proxyd.xml
index a1e8f4f..bbcf3d0 100644
--- a/man/systemd-bus-proxyd.xml
+++ b/man/systemd-bus-proxyd.xml
@@ -1,6 +1,9 @@
<?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">
+"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
+<!ENTITY % entities SYSTEM "custom-entities.ent" >
+%entities;
+]>

<!--
This file is part of systemd.
@@ -50,7 +53,7 @@

<refsynopsisdiv>
<cmdsynopsis>
- <command>/usr/lib/systemd/systemd-bus-proxyd</command>
+ <command>&rootlibexecdir;/systemd-bus-proxyd</command>
<arg choice="opt" rep="repeat">OPTIONS</arg>
<arg choice="opt"><replaceable>PLACEHOLDER</replaceable></arg>
</cmdsynopsis>
diff --git a/man/systemd-bus-***@.service.xml b/man/systemd-bus-***@.service.xml
index dc4f07f..9dabc4d 100644
--- a/man/systemd-bus-***@.service.xml
+++ b/man/systemd-bus-***@.service.xml
@@ -1,6 +1,9 @@
<?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">
+"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
+<!ENTITY % entities SYSTEM "custom-entities.ent" >
+%entities;
+]>

<!--
This file is part of systemd.
diff --git a/man/systemd-cat.xml b/man/systemd-cat.xml
index 9b1a880..d51acd7 100644
--- a/man/systemd-cat.xml
+++ b/man/systemd-cat.xml
@@ -1,6 +1,9 @@
<?xml version='1.0'?> <!--*-nxml-*-->
<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
- "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
+ "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
+<!ENTITY % entities SYSTEM "custom-entities.ent" >
+%entities;
+]>

<!--
This file is part of systemd.
diff --git a/man/systemd-cgls.xml b/man/systemd-cgls.xml
index e8f0368..d3b2404 100644
--- a/man/systemd-cgls.xml
+++ b/man/systemd-cgls.xml
@@ -1,6 +1,9 @@
<?xml version='1.0'?> <!--*-nxml-*-->
<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
- "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
+ "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
+<!ENTITY % entities SYSTEM "custom-entities.ent" >
+%entities;
+]>

<!--
This file is part of systemd.
diff --git a/man/systemd-cgtop.xml b/man/systemd-cgtop.xml
index f1ff218..b0c8800 100644
--- a/man/systemd-cgtop.xml
+++ b/man/systemd-cgtop.xml
@@ -1,6 +1,9 @@
<?xml version='1.0'?> <!--*-nxml-*-->
<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
- "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
+ "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
+<!ENTITY % entities SYSTEM "custom-entities.ent" >
+%entities;
+]>

<!--
This file is part of systemd.
diff --git a/man/systemd-coredump.xml b/man/systemd-coredump.xml
index 5da3857..d40562b 100644
--- a/man/systemd-coredump.xml
+++ b/man/systemd-coredump.xml
@@ -1,6 +1,9 @@
<?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">
+ "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
+<!ENTITY % entities SYSTEM "custom-entities.ent" >
+%entities;
+]>

<!--
This file is part of systemd.
@@ -49,7 +52,7 @@
</refnamediv>

<refsynopsisdiv>
- <para><filename>/usr/lib/systemd/systemd-coredump</filename></para>
+ <para><filename>&rootlibexecdir;/systemd-coredump</filename></para>
</refsynopsisdiv>

<refsect1>
diff --git a/man/systemd-cryptsetup-generator.xml b/man/systemd-cryptsetup-generator.xml
index b627035..c4747f7 100644
--- a/man/systemd-cryptsetup-generator.xml
+++ b/man/systemd-cryptsetup-generator.xml
@@ -1,6 +1,9 @@
<?xml version="1.0"?>
<!--*-nxml-*-->
-<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
+<!ENTITY % entities SYSTEM "custom-entities.ent" >
+%entities;
+]>
<!--
This file is part of systemd.

@@ -46,7 +49,7 @@
</refnamediv>

<refsynopsisdiv>
- <para><filename>/usr/lib/systemd/system-generators/systemd-cryptsetup-generator</filename></para>
+ <para><filename>&rootlibexecdir;/system-generators/systemd-cryptsetup-generator</filename></para>
</refsynopsisdiv>

<refsect1>
diff --git a/man/systemd-***@.service.xml b/man/systemd-***@.service.xml
index ea52485..efc213a 100644
--- a/man/systemd-***@.service.xml
+++ b/man/systemd-***@.service.xml
@@ -1,6 +1,9 @@
<?xml version="1.0"?>
<!--*-nxml-*-->
-<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
+<!ENTITY % entities SYSTEM "custom-entities.ent" >
+%entities;
+]>
<!--
This file is part of systemd.

@@ -48,7 +51,7 @@

<refsynopsisdiv>
<para><filename>systemd-***@.service</filename></para>
- <para><filename>/usr/lib/systemd/systemd-cryptsetup</filename></para>
+ <para><filename>&rootlibexecdir;/systemd-cryptsetup</filename></para>
</refsynopsisdiv>

<refsect1>
diff --git a/man/systemd-debug-generator.xml b/man/systemd-debug-generator.xml
index 5c5e9fc..075ec58 100644
--- a/man/systemd-debug-generator.xml
+++ b/man/systemd-debug-generator.xml
@@ -1,6 +1,9 @@
<?xml version="1.0"?>
<!--*-nxml-*-->
-<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
+<!ENTITY % entities SYSTEM "custom-entities.ent" >
+%entities;
+]>
<!--
This file is part of systemd.

@@ -47,7 +50,7 @@
</refnamediv>

<refsynopsisdiv>
- <para><filename>/usr/lib/systemd/system-generators/systemd-debug-generator</filename></para>
+ <para><filename>&rootlibexecdir;/system-generators/systemd-debug-generator</filename></para>
</refsynopsisdiv>

<refsect1>
diff --git a/man/systemd-delta.xml b/man/systemd-delta.xml
index 6a6460f..69ea041 100644
--- a/man/systemd-delta.xml
+++ b/man/systemd-delta.xml
@@ -1,6 +1,9 @@
<?xml version='1.0'?> <!--*-nxml-*-->
<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
- "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
+ "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
+<!ENTITY % entities SYSTEM "custom-entities.ent" >
+%entities;
+]>

<!--
This file is part of systemd.
diff --git a/man/systemd-detect-virt.xml b/man/systemd-detect-virt.xml
index 40755a2..16ac4f3 100644
--- a/man/systemd-detect-virt.xml
+++ b/man/systemd-detect-virt.xml
@@ -1,6 +1,9 @@
<?xml version='1.0'?> <!--*-nxml-*-->
<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
- "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
+ "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
+<!ENTITY % entities SYSTEM "custom-entities.ent" >
+%entities;
+]>

<!--
This file is part of systemd.
diff --git a/man/systemd-efi-boot-generator.xml b/man/systemd-efi-boot-generator.xml
index 23464bc..1f8194d 100644
--- a/man/systemd-efi-boot-generator.xml
+++ b/man/systemd-efi-boot-generator.xml
@@ -1,6 +1,9 @@
<?xml version="1.0"?>
<!--*-nxml-*-->
-<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
+<!ENTITY % entities SYSTEM "custom-entities.ent" >
+%entities;
+]>
<!--
This file is part of systemd.

@@ -48,7 +51,7 @@
</refnamediv>

<refsynopsisdiv>
- <para><filename>/usr/lib/systemd/system-generators/systemd-efi-boot-generator</filename></para>
+ <para><filename>&rootlibexecdir;/system-generators/systemd-efi-boot-generator</filename></para>
</refsynopsisdiv>

<refsect1>
diff --git a/man/systemd-escape.xml b/man/systemd-escape.xml
index 0c3b230..6680bcf 100644
--- a/man/systemd-escape.xml
+++ b/man/systemd-escape.xml
@@ -1,6 +1,9 @@
<?xml version='1.0'?> <!--*-nxml-*-->
<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
- "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
+ "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
+<!ENTITY % entities SYSTEM "custom-entities.ent" >
+%entities;
+]>

<!--
This file is part of systemd.
diff --git a/man/systemd-firstboot.xml b/man/systemd-firstboot.xml
index 67289da..6ec54bf 100644
--- a/man/systemd-firstboot.xml
+++ b/man/systemd-firstboot.xml
@@ -1,6 +1,9 @@
<?xml version='1.0'?> <!--*-nxml-*-->
<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
- "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
+ "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
+<!ENTITY % entities SYSTEM "custom-entities.ent" >
+%entities;
+]>

<!--
This file is part of systemd.
diff --git a/man/systemd-***@.service.xml b/man/systemd-***@.service.xml
index e4ffcba..7286cd8 100644
--- a/man/systemd-***@.service.xml
+++ b/man/systemd-***@.service.xml
@@ -1,6 +1,9 @@
<?xml version="1.0"?>
<!--*-nxml-*-->
-<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
+<!ENTITY % entities SYSTEM "custom-entities.ent" >
+%entities;
+]>
<!--
This file is part of systemd.

@@ -50,7 +53,7 @@
<refsynopsisdiv>
<para><filename>systemd-***@.service</filename></para>
<para><filename>systemd-fsck-root.service</filename></para>
- <para><filename>/usr/lib/systemd/systemd-fsck</filename></para>
+ <para><filename>&rootlibexecdir;/systemd-fsck</filename></para>
</refsynopsisdiv>

<refsect1>
diff --git a/man/systemd-fstab-generator.xml b/man/systemd-fstab-generator.xml
index c09ed4b..383aab7 100644
--- a/man/systemd-fstab-generator.xml
+++ b/man/systemd-fstab-generator.xml
@@ -1,6 +1,9 @@
<?xml version="1.0"?>
<!--*-nxml-*-->
-<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
+<!ENTITY % entities SYSTEM "custom-entities.ent" >
+%entities;
+]>
<!--
This file is part of systemd.

@@ -46,7 +49,7 @@
</refnamediv>

<refsynopsisdiv>
- <para><filename>/usr/lib/systemd/system-generators/systemd-fstab-generator</filename></para>
+ <para><filename>&rootlibexecdir;/system-generators/systemd-fstab-generator</filename></para>
</refsynopsisdiv>

<refsect1>
diff --git a/man/systemd-getty-generator.xml b/man/systemd-getty-generator.xml
index 3389259..12127d9 100644
--- a/man/systemd-getty-generator.xml
+++ b/man/systemd-getty-generator.xml
@@ -1,6 +1,9 @@
<?xml version="1.0"?>
<!--*-nxml-*-->
-<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
+<!ENTITY % entities SYSTEM "custom-entities.ent" >
+%entities;
+]>
<!--
This file is part of systemd.

@@ -47,7 +50,7 @@
</refnamediv>

<refsynopsisdiv>
- <para><filename>/usr/lib/systemd/system-generators/systemd-getty-generator</filename></para>
+ <para><filename>&rootlibexecdir;/system-generators/systemd-getty-generator</filename></para>
</refsynopsisdiv>

<refsect1>
diff --git a/man/systemd-gpt-auto-generator.xml b/man/systemd-gpt-auto-generator.xml
index bcc64ec..16ff100 100644
--- a/man/systemd-gpt-auto-generator.xml
+++ b/man/systemd-gpt-auto-generator.xml
@@ -1,6 +1,9 @@
<?xml version="1.0"?>
<!--*-nxml-*-->
-<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
+<!ENTITY % entities SYSTEM "custom-entities.ent" >
+%entities;
+]>
<!--
This file is part of systemd.

@@ -50,7 +53,7 @@
</refnamediv>

<refsynopsisdiv>
- <para><filename>/usr/lib/systemd/system-generators/systemd-gpt-auto-generator</filename></para>
+ <para><filename>&rootlibexecdir;/system-generators/systemd-gpt-auto-generator</filename></para>
</refsynopsisdiv>

<refsect1>
diff --git a/man/systemd-halt.service.xml b/man/systemd-halt.service.xml
index c94e2a1..7e83a88 100644
--- a/man/systemd-halt.service.xml
+++ b/man/systemd-halt.service.xml
@@ -1,6 +1,9 @@
<?xml version='1.0'?> <!--*-nxml-*-->
<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
- "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
+ "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
+<!ENTITY % entities SYSTEM "custom-entities.ent" >
+%entities;
+]>

<!--
This file is part of systemd.
@@ -56,7 +59,7 @@
<para><filename>systemd-poweroff.service</filename></para>
<para><filename>systemd-reboot.service</filename></para>
<para><filename>systemd-kexec.service</filename></para>
- <para><filename>/usr/lib/systemd/systemd-shutdown</filename></para>
+ <para><filename>&rootlibexecdir;/systemd-shutdown</filename></para>
</refsynopsisdiv>

<refsect1>
@@ -75,7 +78,7 @@

<para>When these services are run, they ensure that PID 1 is
replaced by the
- <filename>/usr/lib/systemd/systemd-shutdown</filename> tool which
+ <filename>&rootlibexecdir;/systemd-shutdown</filename> tool which
is then responsible for the actual shutdown. Before shutting down,
this binary will try to unmount all remaining file systems,
disable all remaining swap devices, detach all remaining storage
@@ -90,7 +93,7 @@
<para>Immediately before executing the actual system
halt/poweroff/reboot/kexec <filename>systemd-shutdown</filename>
will run all executables in
- <filename>/usr/lib/systemd/system-shutdown/</filename> and pass
+ <filename>&rootlibexecdir;/system-shutdown/</filename> and pass
one arguments to them: either <literal>halt</literal>,
<literal>poweroff</literal>, <literal>reboot</literal> or
<literal>kexec</literal>, depending on the chosen action. All
diff --git a/man/systemd-hibernate-resume-generator.xml b/man/systemd-hibernate-resume-generator.xml
index d811b9b..52837bc 100644
--- a/man/systemd-hibernate-resume-generator.xml
+++ b/man/systemd-hibernate-resume-generator.xml
@@ -1,6 +1,9 @@
<?xml version="1.0"?>
<!--*-nxml-*-->
-<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
+<!ENTITY % entities SYSTEM "custom-entities.ent" >
+%entities;
+]>
<!--
This file is part of systemd.

@@ -46,7 +49,7 @@
</refnamediv>

<refsynopsisdiv>
- <para><filename>/usr/lib/systemd/system-generators/systemd-hibernate-resume-generator</filename></para>
+ <para><filename>&rootlibexecdir;/system-generators/systemd-hibernate-resume-generator</filename></para>
</refsynopsisdiv>

<refsect1>
diff --git a/man/systemd-hibernate-***@.service.xml b/man/systemd-hibernate-***@.service.xml
index 7d00827..bca08b5 100644
--- a/man/systemd-hibernate-***@.service.xml
+++ b/man/systemd-hibernate-***@.service.xml
@@ -1,6 +1,9 @@
<?xml version="1.0"?>
<!--*-nxml-*-->
-<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
+<!ENTITY % entities SYSTEM "custom-entities.ent" >
+%entities;
+]>
<!--
This file is part of systemd.

@@ -48,7 +51,7 @@

<refsynopsisdiv>
<para><filename>systemd-hibernate-***@.service</filename></para>
- <para><filename>/usr/lib/systemd/systemd-hibernate-resume</filename></para>
+ <para><filename>&rootlibexecdir;/systemd-hibernate-resume</filename></para>
</refsynopsisdiv>

<refsect1>
diff --git a/man/systemd-hostnamed.service.xml b/man/systemd-hostnamed.service.xml
index 6990d41..2db1d03 100644
--- a/man/systemd-hostnamed.service.xml
+++ b/man/systemd-hostnamed.service.xml
@@ -1,6 +1,9 @@
<?xml version='1.0'?> <!--*-nxml-*-->
<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
- "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
+ "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
+<!ENTITY % entities SYSTEM "custom-entities.ent" >
+%entities;
+]>

<!--
This file is part of systemd.
@@ -50,7 +53,7 @@

<refsynopsisdiv>
<para><filename>systemd-hostnamed.service</filename></para>
- <para><filename>/usr/lib/systemd/systemd-hostnamed</filename></para>
+ <para><filename>&rootlibexecdir;/systemd-hostnamed</filename></para>
</refsynopsisdiv>

<refsect1>
diff --git a/man/systemd-hwdb.xml b/man/systemd-hwdb.xml
index f1a1402..9a58776 100644
--- a/man/systemd-hwdb.xml
+++ b/man/systemd-hwdb.xml
@@ -1,6 +1,9 @@
<?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">
+ "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
+<!ENTITY % entities SYSTEM "custom-entities.ent" >
+%entities;
+]>

<refentry id="systemd-hwdb" conditional="ENABLE_HWDB">
<refentryinfo>
@@ -57,7 +60,7 @@
<varlistentry>
<term><option>--usr</option></term>
<listitem>
- <para>Generate in /usr/lib/udev instead of /etc/udev.</para>
+ <para>Generate in &udevlibexecdir; instead of /etc/udev.</para>
</listitem>
</varlistentry>
<varlistentry>
diff --git a/man/systemd-inhibit.xml b/man/systemd-inhibit.xml
index 9d85908..6ff0721 100644
--- a/man/systemd-inhibit.xml
+++ b/man/systemd-inhibit.xml
@@ -1,6 +1,9 @@
<?xml version='1.0'?> <!--*-nxml-*-->
<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
- "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
+ "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
+<!ENTITY % entities SYSTEM "custom-entities.ent" >
+%entities;
+]>

<!--
This file is part of systemd.
diff --git a/man/systemd-initctl.service.xml b/man/systemd-initctl.service.xml
index 5c7f9a4..95288d0 100644
--- a/man/systemd-initctl.service.xml
+++ b/man/systemd-initctl.service.xml
@@ -1,6 +1,9 @@
<?xml version='1.0'?> <!--*-nxml-*-->
<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
- "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
+ "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
+<!ENTITY % entities SYSTEM "custom-entities.ent" >
+%entities;
+]>

<!--
This file is part of systemd.
@@ -52,7 +55,7 @@
<refsynopsisdiv>
<para><filename>systemd-initctl.service</filename></para>
<para><filename>systemd-initctl.socket</filename></para>
- <para><filename>/usr/lib/systemd/systemd-initctl</filename></para>
+ <para><filename>&rootlibexecdir;/systemd-initctl</filename></para>
</refsynopsisdiv>

<refsect1>
diff --git a/man/systemd-journal-gatewayd.service.xml b/man/systemd-journal-gatewayd.service.xml
index 6df2248..f758879 100644
--- a/man/systemd-journal-gatewayd.service.xml
+++ b/man/systemd-journal-gatewayd.service.xml
@@ -1,6 +1,9 @@
<?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">
+"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
+<!ENTITY % entities SYSTEM "custom-entities.ent" >
+%entities;
+]>

<!--
This file is part of systemd.
@@ -54,7 +57,7 @@
<para><filename>systemd-journal-gatewayd.service</filename></para>
<para><filename>systemd-journal-gatewayd.socket</filename></para>
<cmdsynopsis>
- <command>/usr/lib/systemd/systemd-journal-gatewayd</command>
+ <command>&rootlibexecdir;/systemd-journal-gatewayd</command>
<arg choice="opt" rep="repeat">OPTIONS</arg>
</cmdsynopsis>
</refsynopsisdiv>
diff --git a/man/systemd-journal-remote.xml b/man/systemd-journal-remote.xml
index ebaca26..596479e 100644
--- a/man/systemd-journal-remote.xml
+++ b/man/systemd-journal-remote.xml
@@ -1,6 +1,9 @@
<?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">
+"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
+<!ENTITY % entities SYSTEM "custom-entities.ent" >
+%entities;
+]>

<!--
This file is part of systemd.
diff --git a/man/systemd-journal-upload.xml b/man/systemd-journal-upload.xml
index 597f2a2..5398ff4 100644
--- a/man/systemd-journal-upload.xml
+++ b/man/systemd-journal-upload.xml
@@ -1,6 +1,9 @@
<?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">
+"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
+<!ENTITY % entities SYSTEM "custom-entities.ent" >
+%entities;
+]>

<!--
This file is part of systemd.
@@ -243,8 +246,8 @@ openssl ca -batch -config ca.conf -notext -in $CLIENT.csr -out $CLIENT.pem
<varname>TrustedCertificateFile=</varname>,
<varname>ServerCertificateFile=</varname>,
<varname>ServerKeyFile=</varname>, in
- <filename>/etc/systemd/journal-remote.conf</filename> and
- <filename>/etc/systemd/journal-upload.conf</filename>
+ <filename>&pkgsysconfdir;/journal-remote.conf</filename> and
+ <filename>&pkgsysconfdir;/journal-upload.conf</filename>
respectively. The default locations can be queried by using
<command>systemd-journal-remote --help</command> and
<command>systemd-journal-upload --help</command>.</para>
diff --git a/man/systemd-journald.service.xml b/man/systemd-journald.service.xml
index 8280d6c..ead1eee 100644
--- a/man/systemd-journald.service.xml
+++ b/man/systemd-journald.service.xml
@@ -1,6 +1,9 @@
<?xml version='1.0'?> <!--*-nxml-*-->
<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
- "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
+ "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
+<!ENTITY % entities SYSTEM "custom-entities.ent" >
+%entities;
+]>

<!--
This file is part of systemd.
@@ -54,7 +57,7 @@
<para><filename>systemd-journald.service</filename></para>
<para><filename>systemd-journald.socket</filename></para>
<para><filename>systemd-journald-dev-log.socket</filename></para>
- <para><filename>/usr/lib/systemd/systemd-journald</filename></para>
+ <para><filename>&rootlibexecdir;/systemd-journald</filename></para>
</refsynopsisdiv>

<refsect1>
@@ -199,7 +202,7 @@

<variablelist>
<varlistentry>
- <term><filename>/etc/systemd/journald.conf</filename></term>
+ <term><filename>&pkgsysconfdir;/journald.conf</filename></term>

<listitem><para>Configure
<command>systemd-journald</command>
diff --git a/man/systemd-localed.service.xml b/man/systemd-localed.service.xml
index 06aa78c..1628054 100644
--- a/man/systemd-localed.service.xml
+++ b/man/systemd-localed.service.xml
@@ -1,6 +1,9 @@
<?xml version='1.0'?> <!--*-nxml-*-->
<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
- "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
+ "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
+<!ENTITY % entities SYSTEM "custom-entities.ent" >
+%entities;
+]>

<!--
This file is part of systemd.
@@ -50,7 +53,7 @@

<refsynopsisdiv>
<para><filename>systemd-localed.service</filename></para>
- <para><filename>/usr/lib/systemd/systemd-localed</filename></para>
+ <para><filename>&rootlibexecdir;/systemd-localed</filename></para>
</refsynopsisdiv>

<refsect1>
diff --git a/man/systemd-logind.service.xml b/man/systemd-logind.service.xml
index 5733e42..1416d88 100644
--- a/man/systemd-logind.service.xml
+++ b/man/systemd-logind.service.xml
@@ -1,6 +1,9 @@
<?xml version='1.0'?> <!--*-nxml-*-->
<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
- "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
+ "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
+<!ENTITY % entities SYSTEM "custom-entities.ent" >
+%entities;
+]>

<!--
This file is part of systemd.
@@ -50,7 +53,7 @@

<refsynopsisdiv>
<para><filename>systemd-logind.service</filename></para>
- <para><filename>/usr/lib/systemd/systemd-logind</filename></para>
+ <para><filename>&rootlibexecdir;/systemd-logind</filename></para>
</refsynopsisdiv>

<refsect1>
diff --git a/man/systemd-machine-id-commit.service.xml b/man/systemd-machine-id-commit.service.xml
index 7c8fc08..7bda76c 100644
--- a/man/systemd-machine-id-commit.service.xml
+++ b/man/systemd-machine-id-commit.service.xml
@@ -1,6 +1,9 @@
<?xml version="1.0"?>
<!--*-nxml-*-->
-<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
+<!ENTITY % entities SYSTEM "custom-entities.ent" >
+%entities;
+]>
<!--
This file is part of systemd.

@@ -47,7 +50,7 @@

<refsynopsisdiv>
<para><filename>systemd-machine-id-commit.service</filename></para>
- <para><filename>/usr/lib/systemd/systemd-machine-id-commit</filename></para>
+ <para><filename>&rootlibexecdir;/systemd-machine-id-commit</filename></para>
</refsynopsisdiv>

<refsect1>
diff --git a/man/systemd-machine-id-commit.xml b/man/systemd-machine-id-commit.xml
index cfb1722..0ebbfe7 100644
--- a/man/systemd-machine-id-commit.xml
+++ b/man/systemd-machine-id-commit.xml
@@ -1,6 +1,9 @@
<?xml version='1.0'?> <!--*-nxml-*-->
<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
- "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
+ "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
+<!ENTITY % entities SYSTEM "custom-entities.ent" >
+%entities;
+]>

<!--
This file is part of systemd.
diff --git a/man/systemd-machine-id-setup.xml b/man/systemd-machine-id-setup.xml
index 182717f..5a84a3b 100644
--- a/man/systemd-machine-id-setup.xml
+++ b/man/systemd-machine-id-setup.xml
@@ -1,6 +1,9 @@
<?xml version='1.0'?> <!--*-nxml-*-->
<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
- "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
+ "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
+<!ENTITY % entities SYSTEM "custom-entities.ent" >
+%entities;
+]>

<!--
This file is part of systemd.
diff --git a/man/systemd-machined.service.xml b/man/systemd-machined.service.xml
index 999aeee..a62e42c 100644
--- a/man/systemd-machined.service.xml
+++ b/man/systemd-machined.service.xml
@@ -1,6 +1,9 @@
<?xml version='1.0'?> <!--*-nxml-*-->
<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
- "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
+ "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
+<!ENTITY % entities SYSTEM "custom-entities.ent" >
+%entities;
+]>

<!--
This file is part of systemd.
@@ -50,7 +53,7 @@

<refsynopsisdiv>
<para><filename>systemd-machined.service</filename></para>
- <para><filename>/usr/lib/systemd/systemd-machined</filename></para>
+ <para><filename>&rootlibexecdir;/systemd-machined</filename></para>
</refsynopsisdiv>

<refsect1>
diff --git a/man/systemd-modules-load.service.xml b/man/systemd-modules-load.service.xml
index dacd083..dc9e2a8 100644
--- a/man/systemd-modules-load.service.xml
+++ b/man/systemd-modules-load.service.xml
@@ -1,6 +1,9 @@
<?xml version="1.0"?>
<!--*-nxml-*-->
-<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
+<!ENTITY % entities SYSTEM "custom-entities.ent" >
+%entities;
+]>
<!--
This file is part of systemd.

@@ -48,7 +51,7 @@

<refsynopsisdiv>
<para><filename>systemd-modules-load.service</filename></para>
- <para><filename>/usr/lib/systemd/systemd-modules-load</filename></para>
+ <para><filename>&rootlibexecdir;/systemd-modules-load</filename></para>
</refsynopsisdiv>

<refsect1>
diff --git a/man/systemd-networkd-wait-online.service.xml b/man/systemd-networkd-wait-online.service.xml
index f53b337..157671d 100644
--- a/man/systemd-networkd-wait-online.service.xml
+++ b/man/systemd-networkd-wait-online.service.xml
@@ -1,6 +1,9 @@
<?xml version='1.0'?> <!--*-nxml-*-->
<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
- "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
+ "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
+<!ENTITY % entities SYSTEM "custom-entities.ent" >
+%entities;
+]>

<!--
This file is part of systemd.
@@ -50,7 +53,7 @@

<refsynopsisdiv>
<para><filename>systemd-networkd-wait-online.service</filename></para>
- <para><filename>/usr/lib/systemd/systemd-networkd-wait-online</filename></para>
+ <para><filename>&rootlibexecdir;/systemd-networkd-wait-online</filename></para>
</refsynopsisdiv>

<refsect1>
diff --git a/man/systemd-networkd.service.xml b/man/systemd-networkd.service.xml
index 0bfe551..1eef5b7 100644
--- a/man/systemd-networkd.service.xml
+++ b/man/systemd-networkd.service.xml
@@ -1,6 +1,9 @@
<?xml version='1.0'?> <!--*-nxml-*-->
<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
- "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
+ "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
+<!ENTITY % entities SYSTEM "custom-entities.ent" >
+%entities;
+]>

<!--
This file is part of systemd.
@@ -50,7 +53,7 @@

<refsynopsisdiv>
<para><filename>systemd-networkd.service</filename></para>
- <para><filename>/usr/lib/systemd/systemd-networkd</filename></para>
+ <para><filename>&rootlibexecdir;/systemd-networkd</filename></para>
</refsynopsisdiv>

<refsect1>
@@ -75,10 +78,10 @@

<refsect1><title>Configuration Files</title>
<para>The configuration files are read from the files located in the
- system network directory <filename>/usr/lib/systemd/network</filename>,
+ system network directory <filename>&rootlibexecdir;/network</filename>,
the volatile runtime network directory
<filename>/run/systemd/network</filename> and the local administration
- network directory <filename>/etc/systemd/network</filename>.</para>
+ network directory <filename>&pkgsysconfdir;/network</filename>.</para>

<para>Networks are configured in <filename>.network</filename>
files, see
diff --git a/man/systemd-notify.xml b/man/systemd-notify.xml
index 06d5ae5..1158473 100644
--- a/man/systemd-notify.xml
+++ b/man/systemd-notify.xml
@@ -1,6 +1,9 @@
<?xml version='1.0'?> <!--*-nxml-*-->
<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
- "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
+ "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
+<!ENTITY % entities SYSTEM "custom-entities.ent" >
+%entities;
+]>

<!--
This file is part of systemd.
diff --git a/man/systemd-nspawn.xml b/man/systemd-nspawn.xml
index 06285ed..218c729 100644
--- a/man/systemd-nspawn.xml
+++ b/man/systemd-nspawn.xml
@@ -1,6 +1,9 @@
<?xml version='1.0'?> <!--*-nxml-*-->
<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
- "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
+ "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
+<!ENTITY % entities SYSTEM "custom-entities.ent" >
+%entities;
+]>

<!--
This file is part of systemd.
diff --git a/man/systemd-path.xml b/man/systemd-path.xml
index dfc75ee..185a0cc 100644
--- a/man/systemd-path.xml
+++ b/man/systemd-path.xml
@@ -1,6 +1,9 @@
<?xml version='1.0'?> <!--*-nxml-*-->
<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
- "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
+ "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
+<!ENTITY % entities SYSTEM "custom-entities.ent" >
+%entities;
+]>

<!--
This file is part of systemd.
diff --git a/man/systemd-quotacheck.service.xml b/man/systemd-quotacheck.service.xml
index 9d49762..7673635 100644
--- a/man/systemd-quotacheck.service.xml
+++ b/man/systemd-quotacheck.service.xml
@@ -1,6 +1,9 @@
<?xml version="1.0"?>
<!--*-nxml-*-->
-<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
+<!ENTITY % entities SYSTEM "custom-entities.ent" >
+%entities;
+]>
<!--
This file is part of systemd.

@@ -48,7 +51,7 @@

<refsynopsisdiv>
<para><filename>systemd-quotacheck.service</filename></para>
- <para><filename>/usr/lib/systemd/systemd-quotacheck</filename></para>
+ <para><filename>&rootlibexecdir;/systemd-quotacheck</filename></para>
</refsynopsisdiv>

<refsect1>
diff --git a/man/systemd-random-seed.service.xml b/man/systemd-random-seed.service.xml
index 8c83668..580c351 100644
--- a/man/systemd-random-seed.service.xml
+++ b/man/systemd-random-seed.service.xml
@@ -1,6 +1,9 @@
<?xml version="1.0"?>
<!--*-nxml-*-->
-<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
+<!ENTITY % entities SYSTEM "custom-entities.ent" >
+%entities;
+]>
<!--
This file is part of systemd.

@@ -48,7 +51,7 @@

<refsynopsisdiv>
<para><filename>systemd-random-seed.service</filename></para>
- <para><filename>/usr/lib/systemd/systemd-random-seed</filename></para>
+ <para><filename>&rootlibexecdir;/systemd-random-seed</filename></para>
</refsynopsisdiv>

<refsect1>
diff --git a/man/systemd-remount-fs.service.xml b/man/systemd-remount-fs.service.xml
index 9bc07fc..c8c3d16 100644
--- a/man/systemd-remount-fs.service.xml
+++ b/man/systemd-remount-fs.service.xml
@@ -1,6 +1,9 @@
<?xml version="1.0"?>
<!--*-nxml-*-->
-<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
+<!ENTITY % entities SYSTEM "custom-entities.ent" >
+%entities;
+]>
<!--
This file is part of systemd.

@@ -48,7 +51,7 @@

<refsynopsisdiv>
<para><filename>systemd-remount-fs.service</filename></para>
- <para><filename>/usr/lib/systemd/systemd-remount-fs</filename></para>
+ <para><filename>&rootlibexecdir;/systemd-remount-fs</filename></para>
</refsynopsisdiv>

<refsect1>
diff --git a/man/systemd-resolved.service.xml b/man/systemd-resolved.service.xml
index 89ec5f8..892ebff 100644
--- a/man/systemd-resolved.service.xml
+++ b/man/systemd-resolved.service.xml
@@ -1,6 +1,9 @@
<?xml version='1.0'?> <!--*-nxml-*-->
<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
- "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
+ "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
+<!ENTITY % entities SYSTEM "custom-entities.ent" >
+%entities;
+]>

<!--
This file is part of systemd.
@@ -50,7 +53,7 @@

<refsynopsisdiv>
<para><filename>systemd-resolved.service</filename></para>
- <para><filename>/usr/lib/systemd/systemd-resolved</filename></para>
+ <para><filename>&rootlibexecdir;/systemd-resolved</filename></para>
</refsynopsisdiv>

<refsect1>
diff --git a/man/systemd-***@.service.xml b/man/systemd-***@.service.xml
index 709b09d..befe001 100644
--- a/man/systemd-***@.service.xml
+++ b/man/systemd-***@.service.xml
@@ -1,6 +1,9 @@
<?xml version="1.0"?>
<!--*-nxml-*-->
-<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
+<!ENTITY % entities SYSTEM "custom-entities.ent" >
+%entities;
+]>
<!--
This file is part of systemd.

@@ -48,7 +51,7 @@

<refsynopsisdiv>
<para><filename>systemd-***@.service</filename></para>
- <para><filename>/usr/lib/systemd/systemd-rfkill</filename></para>
+ <para><filename>&rootlibexecdir;/systemd-rfkill</filename></para>
</refsynopsisdiv>

<refsect1>
diff --git a/man/systemd-run.xml b/man/systemd-run.xml
index 71b365c..ddd08e5 100644
--- a/man/systemd-run.xml
+++ b/man/systemd-run.xml
@@ -1,6 +1,9 @@
<?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">
+"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
+<!ENTITY % entities SYSTEM "custom-entities.ent" >
+%entities;
+]>

<!--
This file is part of systemd.
diff --git a/man/systemd-sleep.conf.xml b/man/systemd-sleep.conf.xml
index 9a379ec..c5d26d0 100644
--- a/man/systemd-sleep.conf.xml
+++ b/man/systemd-sleep.conf.xml
@@ -1,6 +1,9 @@
<?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">
+"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
+<!ENTITY % entities SYSTEM "custom-entities.ent" >
+%entities;
+]>

<!--
This file is part of systemd.
@@ -49,10 +52,10 @@
</refnamediv>

<refsynopsisdiv>
- <para><filename>/etc/systemd/sleep.conf</filename></para>
- <para><filename>/etc/systemd/sleep.conf.d/*.conf</filename></para>
+ <para><filename>&pkgsysconfdir;/sleep.conf</filename></para>
+ <para><filename>&pkgsysconfdir;/sleep.conf.d/*.conf</filename></para>
<para><filename>/run/systemd/sleep.conf.d/*.conf</filename></para>
- <para><filename>/usr/lib/systemd/sleep.conf.d/*.conf</filename></para>
+ <para><filename>&rootlibexecdir;/sleep.conf.d/*.conf</filename></para>
</refsynopsisdiv>

<refsect1>
@@ -119,7 +122,7 @@

<para>The following options can be configured in the
<literal>[Sleep]</literal> section of
- <filename>/etc/systemd/sleep.conf</filename> or a
+ <filename>&pkgsysconfdir;/sleep.conf</filename> or a
<filename>sleep.conf.d</filename> file:</para>

<variablelist class='systemd-directives'>
diff --git a/man/systemd-socket-proxyd.xml b/man/systemd-socket-proxyd.xml
index ae4217b..dc3baef 100644
--- a/man/systemd-socket-proxyd.xml
+++ b/man/systemd-socket-proxyd.xml
@@ -1,7 +1,10 @@
<?xml version="1.0"?>
<!--*-nxml-*-->
<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
- "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
+ "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
+<!ENTITY % entities SYSTEM "custom-entities.ent" >
+%entities;
+]>
<!--
This file is part of systemd.

@@ -113,7 +116,7 @@ Requires=nginx.service
After=nginx.service

[Service]
-ExecStart=/usr/lib/systemd/systemd-socket-proxyd /tmp/nginx.sock
+ExecStart=]]>&rootlibexecdir;<![CDATA[/systemd-socket-proxyd /tmp/nginx.sock
PrivateTmp=yes
PrivateNetwork=yes]]></programlisting>
</example>
@@ -156,7 +159,7 @@ After=nginx.service
JoinsNamespaceOf=nginx.service

[Service]
-ExecStart=/usr/lib/systemd/systemd-socket-proxyd 127.0.0.1:8080
+ExecStart=]]>&rootlibexecdir;<![CDATA[/systemd-socket-proxyd 127.0.0.1:8080
PrivateTmp=yes
PrivateNetwork=yes]]></programlisting>
</example>
diff --git a/man/systemd-suspend.service.xml b/man/systemd-suspend.service.xml
index a8beb86..2722d18 100644
--- a/man/systemd-suspend.service.xml
+++ b/man/systemd-suspend.service.xml
@@ -1,6 +1,9 @@
<?xml version='1.0'?> <!--*-nxml-*-->
<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
- "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
+ "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
+<!ENTITY % entities SYSTEM "custom-entities.ent" >
+%entities;
+]>

<!--
This file is part of systemd.
@@ -56,7 +59,7 @@
<para><filename>systemd-suspend.service</filename></para>
<para><filename>systemd-hibernate.service</filename></para>
<para><filename>systemd-hybrid-sleep.service</filename></para>
- <para><filename>/usr/lib/systemd/system-sleep</filename></para>
+ <para><filename>&rootlibexecdir;/system-sleep</filename></para>
</refsynopsisdiv>

<refsect1>
@@ -75,7 +78,7 @@
<para>Immediately before entering system suspend and/or
hibernation <filename>systemd-suspend.service</filename> (and the
other mentioned units, respectively) will run all executables in
- <filename>/usr/lib/systemd/system-sleep/</filename> and pass two
+ <filename>&rootlibexecdir;/system-sleep/</filename> and pass two
arguments to them. The first argument will be
<literal>pre</literal>, the second either
<literal>suspend</literal>, <literal>hibernate</literal>, or
@@ -87,7 +90,7 @@
until all executables have finished.</para>

<para>Note that scripts or binaries dropped in
- <filename>/usr/lib/systemd/system-sleep/</filename> are intended
+ <filename>&rootlibexecdir;/system-sleep/</filename> are intended
for local use only and should be considered hacks. If applications
want to be notified of system suspend/hibernation and resume,
there are much nicer interfaces available.</para>
@@ -104,7 +107,7 @@
<literal>mem</literal> into <filename>/sys/power/state</filename>,
to trigger the actual system suspend. What exactly is written
where can be configured in the <literal>[Sleep]</literal> section
- of <filename>/etc/systemd/sleep.conf</filename> or a
+ of <filename>&pkgsysconfdir;/sleep.conf</filename> or a
<filename>sleep.conf.d</filename> file. See
<citerefentry><refentrytitle>systemd-sleep.conf</refentrytitle><manvolnum>5</manvolnum></citerefentry>.
</para>
diff --git a/man/systemd-sysctl.service.xml b/man/systemd-sysctl.service.xml
index d4c1a7e..f7da4cd 100644
--- a/man/systemd-sysctl.service.xml
+++ b/man/systemd-sysctl.service.xml
@@ -1,6 +1,9 @@
<?xml version="1.0"?>
<!--*-nxml-*-->
-<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
+<!ENTITY % entities SYSTEM "custom-entities.ent" >
+%entities;
+]>
<!--
This file is part of systemd.

@@ -48,7 +51,7 @@

<refsynopsisdiv>
<para><filename>systemd-sysctl.service</filename></para>
- <para><filename>/usr/lib/systemd/systemd-sysctl</filename></para>
+ <para><filename>&rootlibexecdir;/systemd-sysctl</filename></para>
</refsynopsisdiv>

<refsect1>
diff --git a/man/systemd-system-update-generator.xml b/man/systemd-system-update-generator.xml
index e7fc95c..5c593b3 100644
--- a/man/systemd-system-update-generator.xml
+++ b/man/systemd-system-update-generator.xml
@@ -1,6 +1,9 @@
<?xml version="1.0"?>
<!--*-nxml-*-->
-<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
+<!ENTITY % entities SYSTEM "custom-entities.ent" >
+%entities;
+]>
<!--
This file is part of systemd.

@@ -46,7 +49,7 @@
</refnamediv>

<refsynopsisdiv>
- <para><filename>/usr/lib/systemd/system-generators/systemd-system-update-generator</filename></para>
+ <para><filename>&rootlibexecdir;/system-generators/systemd-system-update-generator</filename></para>
</refsynopsisdiv>

<refsect1>
diff --git a/man/systemd-system.conf.xml b/man/systemd-system.conf.xml
index c06accd..5aa5da4 100644
--- a/man/systemd-system.conf.xml
+++ b/man/systemd-system.conf.xml
@@ -1,6 +1,9 @@
<?xml version='1.0'?> <!--*-nxml-*-->
<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
- "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
+ "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
+<!ENTITY % entities SYSTEM "custom-entities.ent" >
+%entities;
+]>

<!--
This file is part of systemd.
@@ -51,14 +54,14 @@
</refnamediv>

<refsynopsisdiv>
- <para><filename>/etc/systemd/system.conf</filename></para>
- <para><filename>/etc/systemd/system.conf.d/*.conf</filename></para>
+ <para><filename>&pkgsysconfdir;/system.conf</filename></para>
+ <para><filename>&pkgsysconfdir;/system.conf.d/*.conf</filename></para>
<para><filename>/run/systemd/system.conf.d/*.conf</filename></para>
- <para><filename>/usr/lib/systemd/system.conf.d/*.conf</filename></para>
- <para><filename>/etc/systemd/user.conf</filename></para>
- <para><filename>/etc/systemd/user.conf.d/*.conf</filename></para>
+ <para><filename>&rootlibexecdir;/system.conf.d/*.conf</filename></para>
+ <para><filename>&pkgsysconfdir;/user.conf</filename></para>
+ <para><filename>&pkgsysconfdir;/user.conf.d/*.conf</filename></para>
<para><filename>/run/systemd/user.conf.d/*.conf</filename></para>
- <para><filename>/usr/lib/systemd/user.conf.d/*.conf</filename></para>
+ <para><filename>&rootlibexecdir;/user.conf.d/*.conf</filename></para>
</refsynopsisdiv>

<refsect1>
diff --git a/man/systemd-sysusers.xml b/man/systemd-sysusers.xml
index a0c0f99..cbe4f2f 100644
--- a/man/systemd-sysusers.xml
+++ b/man/systemd-sysusers.xml
@@ -1,6 +1,9 @@
<?xml version='1.0'?> <!--*-nxml-*-->
<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
- "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
+ "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
+<!ENTITY % entities SYSTEM "custom-entities.ent" >
+%entities;
+]>

<!--
This file is part of systemd.
diff --git a/man/systemd-sysv-generator.xml b/man/systemd-sysv-generator.xml
index f2d56cb..e7592d6 100644
--- a/man/systemd-sysv-generator.xml
+++ b/man/systemd-sysv-generator.xml
@@ -1,6 +1,9 @@
<?xml version="1.0"?>
<!--*-nxml-*-->
-<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
+<!ENTITY % entities SYSTEM "custom-entities.ent" >
+%entities;
+]>
<!--
This file is part of systemd.

@@ -46,7 +49,7 @@
</refnamediv>

<refsynopsisdiv>
- <para><filename>/usr/lib/systemd/system-generators/systemd-sysv-generator</filename></para>
+ <para><filename>&rootlibexecdir;/system-generators/systemd-sysv-generator</filename></para>
</refsynopsisdiv>

<refsect1>
diff --git a/man/systemd-timedated.service.xml b/man/systemd-timedated.service.xml
index e44163a..3598490 100644
--- a/man/systemd-timedated.service.xml
+++ b/man/systemd-timedated.service.xml
@@ -1,6 +1,9 @@
<?xml version='1.0'?> <!--*-nxml-*-->
<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
- "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
+ "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
+<!ENTITY % entities SYSTEM "custom-entities.ent" >
+%entities;
+]>

<!--
This file is part of systemd.
@@ -50,7 +53,7 @@

<refsynopsisdiv>
<para><filename>systemd-timedated.service</filename></para>
- <para><filename>/usr/lib/systemd/systemd-timedated</filename></para>
+ <para><filename>&rootlibexecdir;/systemd-timedated</filename></para>
</refsynopsisdiv>

<refsect1>
diff --git a/man/systemd-timesyncd.service.xml b/man/systemd-timesyncd.service.xml
index ac1af2d..a1b3645 100644
--- a/man/systemd-timesyncd.service.xml
+++ b/man/systemd-timesyncd.service.xml
@@ -1,6 +1,9 @@
<?xml version='1.0'?> <!--*-nxml-*-->
<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
- "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
+ "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
+<!ENTITY % entities SYSTEM "custom-entities.ent" >
+%entities;
+]>

<!--
This file is part of systemd.
@@ -50,7 +53,7 @@

<refsynopsisdiv>
<para><filename>systemd-timesyncd.service</filename></para>
- <para><filename>/usr/lib/systemd/systemd-timesyncd</filename></para>
+ <para><filename>&rootlibexecdir;/systemd-timesyncd</filename></para>
</refsynopsisdiv>

<refsect1>
diff --git a/man/systemd-tmpfiles.xml b/man/systemd-tmpfiles.xml
index ceec06f..f12f997 100644
--- a/man/systemd-tmpfiles.xml
+++ b/man/systemd-tmpfiles.xml
@@ -1,6 +1,9 @@
<?xml version='1.0'?> <!--*-nxml-*-->
<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
- "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
+ "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
+<!ENTITY % entities SYSTEM "custom-entities.ent" >
+%entities;
+]>

<!--
This file is part of systemd.
diff --git a/man/systemd-tty-ask-password-agent.xml b/man/systemd-tty-ask-password-agent.xml
index 2876fab..dac3a3c 100644
--- a/man/systemd-tty-ask-password-agent.xml
+++ b/man/systemd-tty-ask-password-agent.xml
@@ -1,6 +1,9 @@
<?xml version='1.0'?> <!--*-nxml-*-->
<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
- "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
+ "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
+<!ENTITY % entities SYSTEM "custom-entities.ent" >
+%entities;
+]>

<!--
This file is part of systemd.
diff --git a/man/systemd-udevd.service.xml b/man/systemd-udevd.service.xml
index b18b228..c0d3230 100644
--- a/man/systemd-udevd.service.xml
+++ b/man/systemd-udevd.service.xml
@@ -1,6 +1,9 @@
<?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">
+ "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
+<!ENTITY % entities SYSTEM "custom-entities.ent" >
+%entities;
+]>

<refentry id="systemd-udevd.service"
xmlns:xi="http://www.w3.org/2001/XInclude">
@@ -37,7 +40,7 @@
<para><filename>systemd-udevd-kernel.socket</filename></para>

<cmdsynopsis>
- <command>/usr/lib/systemd/systemd-udevd</command>
+ <command>&rootlibexecdir;/systemd-udevd</command>
<arg><option>--daemon</option></arg>
<arg><option>--debug</option></arg>
<arg><option>--children-max=</option></arg>
diff --git a/man/systemd-update-done.service.xml b/man/systemd-update-done.service.xml
index d65f175..3f12158 100644
--- a/man/systemd-update-done.service.xml
+++ b/man/systemd-update-done.service.xml
@@ -1,6 +1,9 @@
<?xml version="1.0"?>
<!--*-nxml-*-->
-<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
+<!ENTITY % entities SYSTEM "custom-entities.ent" >
+%entities;
+]>
<!--
This file is part of systemd.

@@ -48,7 +51,7 @@

<refsynopsisdiv>
<para><filename>systemd-update-done.service</filename></para>
- <para><filename>/usr/lib/systemd/systemd-update-done</filename></para>
+ <para><filename>&rootlibexecdir;/systemd-update-done</filename></para>
</refsynopsisdiv>

<refsect1>
diff --git a/man/systemd-update-utmp.service.xml b/man/systemd-update-utmp.service.xml
index c8a9cb7..2856918 100644
--- a/man/systemd-update-utmp.service.xml
+++ b/man/systemd-update-utmp.service.xml
@@ -1,6 +1,9 @@
<?xml version="1.0"?>
<!--*-nxml-*-->
-<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
+<!ENTITY % entities SYSTEM "custom-entities.ent" >
+%entities;
+]>
<!--
This file is part of systemd.

@@ -51,7 +54,7 @@
<refsynopsisdiv>
<para><filename>systemd-update-utmp.service</filename></para>
<para><filename>systemd-update-utmp-runlevel.service</filename></para>
- <para><filename>/usr/lib/systemd/systemd-update-utmp</filename></para>
+ <para><filename>&rootlibexecdir;/systemd-update-utmp</filename></para>
</refsynopsisdiv>

<refsect1>
diff --git a/man/systemd-user-sessions.service.xml b/man/systemd-user-sessions.service.xml
index e75ef11..620648c 100644
--- a/man/systemd-user-sessions.service.xml
+++ b/man/systemd-user-sessions.service.xml
@@ -1,6 +1,9 @@
<?xml version="1.0"?>
<!--*-nxml-*-->
-<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
+<!ENTITY % entities SYSTEM "custom-entities.ent" >
+%entities;
+]>
<!--
This file is part of systemd.

@@ -48,7 +51,7 @@

<refsynopsisdiv>
<para><filename>systemd-user-sessions.service</filename></para>
- <para><filename>/usr/lib/systemd/systemd-user-sessions</filename></para>
+ <para><filename>&rootlibexecdir;/systemd-user-sessions</filename></para>
</refsynopsisdiv>

<refsect1>
diff --git a/man/systemd-vconsole-setup.service.xml b/man/systemd-vconsole-setup.service.xml
index 7c6ed08..6c6d8e2 100644
--- a/man/systemd-vconsole-setup.service.xml
+++ b/man/systemd-vconsole-setup.service.xml
@@ -1,6 +1,9 @@
<?xml version="1.0"?>
<!--*-nxml-*-->
-<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
+<!ENTITY % entities SYSTEM "custom-entities.ent" >
+%entities;
+]>
<!--
This file is part of systemd.

@@ -48,7 +51,7 @@

<refsynopsisdiv>
<para><filename>systemd-vconsole-setup.service</filename></para>
- <para><filename>/usr/lib/systemd/systemd-vconsole-setup</filename></para>
+ <para><filename>&rootlibexecdir;/systemd-vconsole-setup</filename></para>
</refsynopsisdiv>

<refsect1>
diff --git a/man/systemd.automount.xml b/man/systemd.automount.xml
index 9561590..18c10d0 100644
--- a/man/systemd.automount.xml
+++ b/man/systemd.automount.xml
@@ -1,6 +1,9 @@
<?xml version='1.0'?> <!--*-nxml-*-->
<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
- "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
+ "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
+<!ENTITY % entities SYSTEM "custom-entities.ent" >
+%entities;
+]>

<!--
This file is part of systemd.
diff --git a/man/systemd.device.xml b/man/systemd.device.xml
index ac6deaf..96a20d1 100644
--- a/man/systemd.device.xml
+++ b/man/systemd.device.xml
@@ -1,6 +1,9 @@
<?xml version='1.0'?> <!--*-nxml-*-->
<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
- "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
+ "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
+<!ENTITY % entities SYSTEM "custom-entities.ent" >
+%entities;
+]>

<!--
This file is part of systemd.
diff --git a/man/systemd.exec.xml b/man/systemd.exec.xml
index 6487772..ea53722 100644
--- a/man/systemd.exec.xml
+++ b/man/systemd.exec.xml
@@ -1,5 +1,8 @@
<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
- "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
+ "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
+<!ENTITY % entities SYSTEM "custom-entities.ent" >
+%entities;
+]>

<!--
This file is part of systemd.
diff --git a/man/systemd.generator.xml b/man/systemd.generator.xml
index 2285e91..5ce0592 100644
--- a/man/systemd.generator.xml
+++ b/man/systemd.generator.xml
@@ -59,14 +59,14 @@

<para>
<literallayout><filename>/run/systemd/system-generators/*</filename>
-<filename>/etc/systemd/system-generators/*</filename>
+<filename>&pkgsysconfdir;/system-generators/*</filename>
<filename>/usr/local/lib/systemd/system-generators/*</filename>
<filename>&systemgeneratordir;/*</filename></literallayout>
</para>

<para>
<literallayout><filename>/run/systemd/user-generators/*</filename>
-<filename>/etc/systemd/user-generators/*</filename>
+<filename>&pkgsysconfdir;/user-generators/*</filename>
<filename>/usr/local/lib/systemd/user-generators/*</filename>
<filename>&usergeneratordir;/*</filename></literallayout>
</para>
diff --git a/man/systemd.journal-fields.xml b/man/systemd.journal-fields.xml
index a101006..2cb010c 100644
--- a/man/systemd.journal-fields.xml
+++ b/man/systemd.journal-fields.xml
@@ -1,6 +1,9 @@
<?xml version='1.0'?> <!--*-nxml-*-->
<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
- "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
+ "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
+<!ENTITY % entities SYSTEM "custom-entities.ent" >
+%entities;
+]>

<!--
This file is part of systemd.
diff --git a/man/systemd.kill.xml b/man/systemd.kill.xml
index e57f0e7..ef828e0 100644
--- a/man/systemd.kill.xml
+++ b/man/systemd.kill.xml
@@ -1,6 +1,9 @@
<?xml version='1.0'?> <!--*-nxml-*-->
<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
- "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
+ "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
+<!ENTITY % entities SYSTEM "custom-entities.ent" >
+%entities;
+]>

<!--
This file is part of systemd.
diff --git a/man/systemd.link.xml b/man/systemd.link.xml
index 3fac760..75cf6e1 100644
--- a/man/systemd.link.xml
+++ b/man/systemd.link.xml
@@ -1,6 +1,9 @@
<?xml version='1.0'?> <!--*-nxml-*-->
<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
- "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
+ "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
+<!ENTITY % entities SYSTEM "custom-entities.ent" >
+%entities;
+]>

<!--
This file is part of systemd.
@@ -56,11 +59,11 @@
<command>net_setup_link</command> udev builtin.</para>

<para>The link files are read from the files located in the system
- network directory <filename>/usr/lib/systemd/network</filename>,
+ network directory <filename>&rootlibexecdir;/network</filename>,
the volatile runtime network directory
<filename>/run/systemd/network</filename>, and the local
administration network directory
- <filename>/etc/systemd/network</filename>. Link files must have
+ <filename>&pkgsysconfdir;/network</filename>. Link files must have
the extension <filename>.link</filename>; other extensions are
ignored. All link files are collectively sorted and processed in
lexical order, regardless of the directories in which they live.
@@ -382,7 +385,7 @@
<refsect1>
<title>Example</title>
<example>
- <title>/etc/systemd/network/wireless.link</title>
+ <title>&pkgsysconfdir;/network/wireless.link</title>

<programlisting>[Match]
MACAddress=12:34:56:78:9a:bc
diff --git a/man/systemd.mount.xml b/man/systemd.mount.xml
index ffffc56..f22c86a 100644
--- a/man/systemd.mount.xml
+++ b/man/systemd.mount.xml
@@ -1,6 +1,9 @@
<?xml version='1.0'?> <!--*-nxml-*-->
<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
- "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
+ "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
+<!ENTITY % entities SYSTEM "custom-entities.ent" >
+%entities;
+]>

<!--
This file is part of systemd.
diff --git a/man/systemd.netdev.xml b/man/systemd.netdev.xml
index 01c31c5..6cd77ab 100644
--- a/man/systemd.netdev.xml
+++ b/man/systemd.netdev.xml
@@ -1,6 +1,9 @@
<?xml version='1.0'?> <!--*-nxml-*-->
<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
- "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
+ "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
+<!ENTITY % entities SYSTEM "custom-entities.ent" >
+%entities;
+]>

<!--
This file is part of systemd.
@@ -68,11 +71,11 @@

<para>The <filename>.netdev</filename> files are read from the
files located in the system network directory
- <filename>/usr/lib/systemd/network</filename>, the volatile
+ <filename>&rootlibexecdir;/network</filename>, the volatile
runtime network directory
<filename>/run/systemd/network</filename> and the local
administration network directory
- <filename>/etc/systemd/network</filename>. All configuration files
+ <filename>&pkgsysconfdir;/network</filename>. All configuration files
are collectively sorted and processed in lexical order, regardless
of the directories in which they live. However, files with
identical filenames replace each other. Files in
@@ -842,7 +845,7 @@
<refsect1>
<title>Example</title>
<example>
- <title>/etc/systemd/network/bridge.netdev</title>
+ <title>&pkgsysconfdir;/network/bridge.netdev</title>

<programlisting>[NetDev]
Name=bridge0
@@ -850,7 +853,7 @@ Kind=bridge</programlisting>
</example>

<example>
- <title>/etc/systemd/network/vlan1.netdev</title>
+ <title>&pkgsysconfdir;/network/vlan1.netdev</title>

<programlisting>[Match]
Virtualization=no
@@ -863,7 +866,7 @@ Kind=vlan
Id=1</programlisting>
</example>
<example>
- <title>/etc/systemd/network/ipip.netdev</title>
+ <title>&pkgsysconfdir;/network/ipip.netdev</title>
<programlisting>[NetDev]
Name=ipip-tun
Kind=ipip
@@ -875,7 +878,7 @@ Remote=192.169.224.239
TTL=64</programlisting>
</example>
<example>
- <title>/etc/systemd/network/tap.netdev</title>
+ <title>&pkgsysconfdir;/network/tap.netdev</title>
<programlisting>[NetDev]
Name=tap-test
Kind=tap
@@ -885,7 +888,7 @@ MultiQueue=true
PacketInfo=true</programlisting> </example>

<example>
- <title>/etc/systemd/network/sit.netdev</title>
+ <title>&pkgsysconfdir;/network/sit.netdev</title>
<programlisting>[NetDev]
Name=sit-tun
Kind=sit
@@ -897,7 +900,7 @@ Remote=10.65.223.239</programlisting>
</example>

<example>
- <title>/etc/systemd/network/gre.netdev</title>
+ <title>&pkgsysconfdir;/network/gre.netdev</title>
<programlisting>[NetDev]
Name=gre-tun
Kind=gre
@@ -909,7 +912,7 @@ Remote=10.65.223.239</programlisting>
</example>

<example>
- <title>/etc/systemd/network/vti.netdev</title>
+ <title>&pkgsysconfdir;/network/vti.netdev</title>

<programlisting>[NetDev]
Name=vti-tun
@@ -922,7 +925,7 @@ Remote=10.65.223.239</programlisting>
</example>

<example>
- <title>/etc/systemd/network/veth.netdev</title>
+ <title>&pkgsysconfdir;/network/veth.netdev</title>
<programlisting>[NetDev]
Name=veth-test
Kind=veth
@@ -932,7 +935,7 @@ Name=veth-peer</programlisting>
</example>

<example>
- <title>/etc/systemd/network/dummy.netdev</title>
+ <title>&pkgsysconfdir;/network/dummy.netdev</title>
<programlisting>[NetDev]
Name=dummy-test
Kind=dummy
diff --git a/man/systemd.network.xml b/man/systemd.network.xml
index bdbe239..0b9781f 100644
--- a/man/systemd.network.xml
+++ b/man/systemd.network.xml
@@ -1,6 +1,9 @@
<?xml version='1.0'?> <!--*-nxml-*-->
<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
- "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
+ "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
+<!ENTITY % entities SYSTEM "custom-entities.ent" >
+%entities;
+]>

<!--
This file is part of systemd.
@@ -64,11 +67,11 @@

<para>The <filename>.network</filename> files are read from the
files located in the system network directory
- <filename>/usr/lib/systemd/network</filename>, the volatile
+ <filename>&rootlibexecdir;/network</filename>, the volatile
runtime network directory
<filename>/run/systemd/network</filename> and the local
administration network directory
- <filename>/etc/systemd/network</filename>. All configuration files
+ <filename>&pkgsysconfdir;/network</filename>. All configuration files
are collectively sorted and processed in lexical order, regardless
of the directories in which they live. However, files with
identical filenames replace each other. Files in
@@ -683,7 +686,7 @@
<refsect1>
<title>Example</title>
<example>
- <title>/etc/systemd/network/50-static.network</title>
+ <title>&pkgsysconfdir;/network/50-static.network</title>

<programlisting>[Match]
Name=enp2s0
@@ -694,7 +697,7 @@ Gateway=192.168.0.1</programlisting>
</example>

<example>
- <title>/etc/systemd/network/80-dhcp.network</title>
+ <title>&pkgsysconfdir;/network/80-dhcp.network</title>

<programlisting>[Match]
Name=en*
@@ -704,7 +707,7 @@ DHCP=yes</programlisting>
</example>

<example>
- <title>/etc/systemd/network/bridge-static.network</title>
+ <title>&pkgsysconfdir;/network/bridge-static.network</title>

<programlisting>[Match]
Name=bridge0
@@ -716,7 +719,7 @@ DNS=192.168.0.1</programlisting>
</example>

<example>
- <title>/etc/systemd/network/bridge-slave-interface.network</title>
+ <title>&pkgsysconfdir;/network/bridge-slave-interface.network</title>

<programlisting>[Match]
Name=enp2s0
@@ -725,7 +728,7 @@ Name=enp2s0
Bridge=bridge0</programlisting>
</example>
<example>
- <title>/etc/systemd/network/ipip.network</title>
+ <title>&pkgsysconfdir;/network/ipip.network</title>

<programlisting>[Match]
Name=em1
@@ -735,7 +738,7 @@ Tunnel=ipip-tun</programlisting>
</example>

<example>
- <title>/etc/systemd/network/sit.network</title>
+ <title>&pkgsysconfdir;/network/sit.network</title>

<programlisting>[Match]
Name=em1
@@ -745,7 +748,7 @@ Tunnel=sit-tun</programlisting>
</example>

<example>
- <title>/etc/systemd/network/gre.network</title>
+ <title>&pkgsysconfdir;/network/gre.network</title>

<programlisting>[Match]
Name=em1
@@ -755,7 +758,7 @@ Tunnel=gre-tun</programlisting>
</example>

<example>
- <title>/etc/systemd/network/vti.network</title>
+ <title>&pkgsysconfdir;/network/vti.network</title>

<programlisting>[Match]
Name=em1
diff --git a/man/systemd.path.xml b/man/systemd.path.xml
index d02bc92..03b626b 100644
--- a/man/systemd.path.xml
+++ b/man/systemd.path.xml
@@ -1,6 +1,9 @@
<?xml version='1.0'?> <!--*-nxml-*-->
<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
- "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
+ "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
+<!ENTITY % entities SYSTEM "custom-entities.ent" >
+%entities;
+]>

<!--
This file is part of systemd.
diff --git a/man/systemd.preset.xml b/man/systemd.preset.xml
index 2f9add8..4667f9d 100644
--- a/man/systemd.preset.xml
+++ b/man/systemd.preset.xml
@@ -1,6 +1,9 @@
<?xml version="1.0"?>
<!--*-nxml-*-->
-<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
+<!ENTITY % entities SYSTEM "custom-entities.ent" >
+%entities;
+]>
<!--
This file is part of systemd.

@@ -46,12 +49,12 @@
</refnamediv>

<refsynopsisdiv>
- <para><filename>/etc/systemd/system-preset/*.preset</filename></para>
+ <para><filename>&pkgsysconfdir;/system-preset/*.preset</filename></para>
<para><filename>/run/systemd/system-preset/*.preset</filename></para>
- <para><filename>/usr/lib/systemd/system-preset/*.preset</filename></para>
- <para><filename>/etc/systemd/user-preset/*.preset</filename></para>
+ <para><filename>&rootlibexecdir;/system-preset/*.preset</filename></para>
+ <para><filename>&pkgsysconfdir;/user-preset/*.preset</filename></para>
<para><filename>/run/systemd/user-preset/*.preset</filename></para>
- <para><filename>/usr/lib/systemd/user-preset/*.preset</filename></para>
+ <para><filename>&rootlibexecdir;/user-preset/*.preset</filename></para>
</refsynopsisdiv>

<refsect1>
@@ -125,7 +128,7 @@
<para>If the administrator wants to disable a preset file supplied
by the vendor, the recommended way is to place a symlink to
<filename>/dev/null</filename> in
- <filename>/etc/systemd/system-preset/</filename> bearing the same
+ <filename>&pkgsysconfdir;/system-preset/</filename> bearing the same
filename.</para>
</refsect1>

@@ -133,7 +136,7 @@
<title>Example</title>

<example>
- <title>Default off example <filename>/usr/lib/systemd/system-preset/99-default.preset</filename>:</title>
+ <title>Default off example <filename>&rootlibexecdir;/system-preset/99-default.preset</filename>:</title>

<programlisting>disable *</programlisting>
</example>
@@ -144,7 +147,7 @@
suchlike.</para>

<example>
- <title>A GNOME spin example <filename>/usr/lib/systemd/system-preset/50-gnome.preset</filename>:</title>
+ <title>A GNOME spin example <filename>&rootlibexecdir;/system-preset/50-gnome.preset</filename>:</title>

<programlisting>enable gdm.service
enable colord.service
@@ -162,7 +165,7 @@ enable avahi-daemon.*</programlisting>
example like the one from the first example above.</para>

<example>
- <title>Administrator policy <filename>/etc/systemd/system-preset/00-lennart.preset</filename>:</title>
+ <title>Administrator policy <filename>&pkgsysconfdir;/system-preset/00-lennart.preset</filename>:</title>

<programlisting>enable httpd.service
enable sshd.service
diff --git a/man/systemd.resource-control.xml b/man/systemd.resource-control.xml
index 8f4e7a3..82e21c6 100644
--- a/man/systemd.resource-control.xml
+++ b/man/systemd.resource-control.xml
@@ -1,6 +1,9 @@
<?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">
+"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
+<!ENTITY % entities SYSTEM "custom-entities.ent" >
+%entities;
+]>

<!--
This file is part of systemd.
diff --git a/man/systemd.scope.xml b/man/systemd.scope.xml
index fd65a85..f137cb7 100644
--- a/man/systemd.scope.xml
+++ b/man/systemd.scope.xml
@@ -1,6 +1,9 @@
<?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">
+"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
+<!ENTITY % entities SYSTEM "custom-entities.ent" >
+%entities;
+]>

<!--
This file is part of systemd.
diff --git a/man/systemd.service.xml b/man/systemd.service.xml
index 7ff2adf..0fe694a 100644
--- a/man/systemd.service.xml
+++ b/man/systemd.service.xml
@@ -1,6 +1,9 @@
<?xml version='1.0'?> <!--*-nxml-*-->
<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
- "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
+ "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
+<!ENTITY % entities SYSTEM "custom-entities.ent" >
+%entities;
+]>

<!--
This file is part of systemd.
diff --git a/man/systemd.slice.xml b/man/systemd.slice.xml
index f0bac41..6509879 100644
--- a/man/systemd.slice.xml
+++ b/man/systemd.slice.xml
@@ -1,6 +1,9 @@
<?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">
+"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
+<!ENTITY % entities SYSTEM "custom-entities.ent" >
+%entities;
+]>

<!--
This file is part of systemd.
diff --git a/man/systemd.snapshot.xml b/man/systemd.snapshot.xml
index 96069c3..4c1f40e 100644
--- a/man/systemd.snapshot.xml
+++ b/man/systemd.snapshot.xml
@@ -1,6 +1,9 @@
<?xml version='1.0'?> <!--*-nxml-*-->
<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
- "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
+ "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
+<!ENTITY % entities SYSTEM "custom-entities.ent" >
+%entities;
+]>

<!--
This file is part of systemd.
diff --git a/man/systemd.socket.xml b/man/systemd.socket.xml
index 1e9778b..1d0fa1b 100644
--- a/man/systemd.socket.xml
+++ b/man/systemd.socket.xml
@@ -1,6 +1,9 @@
<?xml version='1.0'?> <!--*-nxml-*-->
<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
- "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
+ "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
+<!ENTITY % entities SYSTEM "custom-entities.ent" >
+%entities;
+]>

<!--
This file is part of systemd.
diff --git a/man/systemd.special.xml b/man/systemd.special.xml
index cf76aaf..8db3050 100644
--- a/man/systemd.special.xml
+++ b/man/systemd.special.xml
@@ -1,6 +1,9 @@
<?xml version='1.0'?> <!--*-nxml-*-->
<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
- "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
+ "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
+<!ENTITY % entities SYSTEM "custom-entities.ent" >
+%entities;
+]>

<!--
This file is part of systemd.
diff --git a/man/systemd.swap.xml b/man/systemd.swap.xml
index c398677..d3ddc1a 100644
--- a/man/systemd.swap.xml
+++ b/man/systemd.swap.xml
@@ -1,6 +1,9 @@
<?xml version='1.0'?> <!--*-nxml-*-->
<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
- "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
+ "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
+<!ENTITY % entities SYSTEM "custom-entities.ent" >
+%entities;
+]>

<!--
This file is part of systemd.
diff --git a/man/systemd.target.xml b/man/systemd.target.xml
index e790e9b..884177e 100644
--- a/man/systemd.target.xml
+++ b/man/systemd.target.xml
@@ -1,6 +1,9 @@
<?xml version='1.0'?> <!--*-nxml-*-->
<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
- "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
+ "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
+<!ENTITY % entities SYSTEM "custom-entities.ent" >
+%entities;
+]>

<!--
This file is part of systemd.
diff --git a/man/systemd.time.xml b/man/systemd.time.xml
index da07297..570a20e 100644
--- a/man/systemd.time.xml
+++ b/man/systemd.time.xml
@@ -1,6 +1,9 @@
<?xml version='1.0'?> <!--*-nxml-*-->
<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
- "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
+ "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
+<!ENTITY % entities SYSTEM "custom-entities.ent" >
+%entities;
+]>

<!--
This file is part of systemd.
diff --git a/man/systemd.timer.xml b/man/systemd.timer.xml
index 20890f2..5f7e804 100644
--- a/man/systemd.timer.xml
+++ b/man/systemd.timer.xml
@@ -1,6 +1,9 @@
<?xml version='1.0'?> <!--*-nxml-*-->
<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
- "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
+ "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
+<!ENTITY % entities SYSTEM "custom-entities.ent" >
+%entities;
+]>

<!--
This file is part of systemd.
diff --git a/man/systemd.unit.xml b/man/systemd.unit.xml
index 0aa1eea..8286cf3 100644
--- a/man/systemd.unit.xml
+++ b/man/systemd.unit.xml
@@ -64,20 +64,20 @@
<filename><replaceable>slice</replaceable>.slice</filename>,
<filename><replaceable>scope</replaceable>.scope</filename></para>

- <para><literallayout><filename>/etc/systemd/system/*</filename>
+ <para><literallayout><filename>&pkgsysconfdir;/system/*</filename>
<filename>/run/systemd/system/*</filename>
-<filename>/usr/lib/systemd/system/*</filename>
+<filename>&rootlibexecdir;/system/*</filename>
<filename>...</filename>
</literallayout></para>

<para><literallayout><filename>$XDG_CONFIG_HOME/systemd/user/*</filename>
<filename>$HOME/.config/systemd/user/*</filename>
-<filename>/etc/systemd/user/*</filename>
+<filename>&pkgsysconfdir;/user/*</filename>
<filename>$XDG_RUNTIME_DIR/systemd/user/*</filename>
<filename>/run/systemd/user/*</filename>
<filename>$XDG_DATA_HOME/systemd/user/*</filename>
<filename>$HOME/.local/share/systemd/user/*</filename>
-<filename>/usr/lib/systemd/user/*</filename>
+<filename>&rootlibexecdir;/user/*</filename>
<filename>...</filename>
</literallayout></para>
</refsynopsisdiv>
@@ -287,7 +287,7 @@
</thead>
<tbody>
<row>
- <entry><filename>/etc/systemd/system</filename></entry>
+ <entry><filename>&pkgsysconfdir;/system</filename></entry>
<entry>Local configuration</entry>
</row>
<row>
@@ -295,7 +295,7 @@
<entry>Runtime units</entry>
</row>
<row>
- <entry><filename>/usr/lib/systemd/system</filename></entry>
+ <entry><filename>&rootlibexecdir;/system</filename></entry>
<entry>Units of installed packages</entry>
</row>
</tbody>
@@ -326,7 +326,7 @@
<entry>User configuration (only used when $XDG_CONFIG_HOME is not set)</entry>
</row>
<row>
- <entry><filename>/etc/systemd/user</filename></entry>
+ <entry><filename>&pkgsysconfdir;/user</filename></entry>
<entry>Local configuration</entry>
</row>
<row>
@@ -346,7 +346,7 @@
<entry>Units of packages that have been installed in the home directory (only used when $XDG_DATA_HOME is not set)</entry>
</row>
<row>
- <entry><filename>/usr/lib/systemd/user</filename></entry>
+ <entry><filename>&rootlibexecdir;/user</filename></entry>
<entry>Units of packages that have been installed system-wide</entry>
</row>
</tbody>
@@ -1296,7 +1296,7 @@ ExecStart=/usr/sbin/foo-daemon

<para>After running <command>systemctl enable</command>, a
symlink
- <filename>/etc/systemd/system/multi-user.target.wants/foo.service</filename>
+ <filename>&pkgsysconfdir;/system/multi-user.target.wants/foo.service</filename>
linking to the actual unit will be created. It tells systemd to
pull in the unit when starting
<filename>multi-user.target</filename>. The inverse
@@ -1309,11 +1309,11 @@ ExecStart=/usr/sbin/foo-daemon

<para>There are two methods of overriding vendor settings in
unit files: copying the unit file from
- <filename>/usr/lib/systemd/system</filename> to
- <filename>/etc/systemd/system</filename> and modifying the
+ <filename>&rootlibexecdir;/system</filename> to
+ <filename>&pkgsysconfdir;/system</filename> and modifying the
chosen settings. Alternatively, one can create a directory named
<filename><replaceable>unit</replaceable>.d/</filename> within
- <filename>/etc/systemd/system</filename> and place a drop-in
+ <filename>&pkgsysconfdir;/system</filename> and place a drop-in
file <filename><replaceable>name</replaceable>.conf</filename>
there that only changes the specific settings one is interested
in. Note that multiple such drop-in files are read if
@@ -1343,7 +1343,7 @@ ExecStart=/usr/sbin/foo-daemon
load paths for further details.</para>

<para>Suppose there is a vendor-supplied unit
- <filename>/usr/lib/systemd/system/httpd.service</filename> with
+ <filename>&rootlibexecdir;/system/httpd.service</filename> with
the following contents:</para>

<programlisting>[Unit]
@@ -1375,7 +1375,7 @@ WantedBy=multi-user.target</programlisting>
the niceness of the service to its default value of 0.</para>

<para>The first possibility is to copy the unit file to
- <filename>/etc/systemd/system/httpd.service</filename> and
+ <filename>&pkgsysconfdir;/system/httpd.service</filename> and
change the chosen settings:</para>

<programlisting>[Unit]
@@ -1395,7 +1395,7 @@ WantedBy=multi-user.target</programlisting>

<para>Alternatively, the administrator could create a drop-in
file
- <filename>/etc/systemd/system/httpd.service.d/local.conf</filename>
+ <filename>&pkgsysconfdir;/system/httpd.service.d/local.conf</filename>
with the following contents:</para>

<programlisting>[Unit]
diff --git a/man/systemd.xml b/man/systemd.xml
index 4556d56..5fa65a3 100644
--- a/man/systemd.xml
+++ b/man/systemd.xml
@@ -1,6 +1,9 @@
<?xml version='1.0'?> <!--*-nxml-*-->
<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
- "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
+ "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
+<!ENTITY % entities SYSTEM "custom-entities.ent" >
+%entities;
+]>

<!--
This file is part of systemd.
@@ -438,7 +441,7 @@
by <command>pkg-config systemd
--variable=systemdsystemunitdir</command>. Other directories
checked are <filename>/usr/local/lib/systemd/system</filename>
- and <filename>/usr/lib/systemd/system</filename>. User
+ and <filename>&rootlibexecdir;/system</filename>. User
configuration always takes precedence. <command>pkg-config
systemd --variable=systemdsystemconfdir</command> returns the
path of the system configuration directory. Packages should
diff --git a/man/sysusers.d.xml b/man/sysusers.d.xml
index 99aa07a..3085f3d 100644
--- a/man/sysusers.d.xml
+++ b/man/sysusers.d.xml
@@ -1,6 +1,9 @@
<?xml version="1.0"?>
<!--*-nxml-*-->
-<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
+<!ENTITY % entities SYSTEM "custom-entities.ent" >
+%entities;
+]>
<!--
This file is part of systemd.

diff --git a/man/telinit.xml b/man/telinit.xml
index 02d31fb..ec7e8ea 100644
--- a/man/telinit.xml
+++ b/man/telinit.xml
@@ -1,6 +1,9 @@
<?xml version='1.0'?> <!--*-nxml-*-->
<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
- "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
+ "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
+<!ENTITY % entities SYSTEM "custom-entities.ent" >
+%entities;
+]>

<!--
This file is part of systemd.
diff --git a/man/timedatectl.xml b/man/timedatectl.xml
index 2d42b41..d7bd052 100644
--- a/man/timedatectl.xml
+++ b/man/timedatectl.xml
@@ -1,6 +1,9 @@
<?xml version='1.0'?> <!--*-nxml-*-->
<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
- "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
+ "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
+<!ENTITY % entities SYSTEM "custom-entities.ent" >
+%entities;
+]>

<!--
This file is part of systemd.
@@ -210,13 +213,13 @@ Password: ********

<programlisting>$ systemctl status systemd-timesyncd.service
● systemd-timesyncd.service - Network Time Synchronization
- Loaded: loaded (/usr/lib/systemd/system/systemd-timesyncd.service; enabled)
+ Loaded: loaded (&rootlibexecdir;/system/systemd-timesyncd.service; enabled)
Active: active (running) since Mo 2015-03-30 14:20:38 CEST; 5s ago
Docs: man:systemd-timesyncd.service(8)
Main PID: 595 (systemd-timesyn)
Status: "Using Time Server 216.239.38.15:123 (time4.google.com)."
CGroup: /system.slice/systemd-timesyncd.service
- └─595 /usr/lib/systemd/systemd-timesyncd
+ └─595 &rootlibexecdir;/systemd-timesyncd
...</programlisting>
</para>
</refsect1>
diff --git a/man/timesyncd.conf.xml b/man/timesyncd.conf.xml
index 89a651c..c297d32 100644
--- a/man/timesyncd.conf.xml
+++ b/man/timesyncd.conf.xml
@@ -1,6 +1,9 @@
<?xml version='1.0'?> <!--*-nxml-*-->
<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
- "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
+ "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
+<!ENTITY % entities SYSTEM "custom-entities.ent" >
+%entities;
+]>

<!--
This file is part of systemd.
@@ -49,10 +52,10 @@
</refnamediv>

<refsynopsisdiv>
- <para><filename>/etc/systemd/timesyncd.conf</filename></para>
- <para><filename>/etc/systemd/timesyncd.conf.d/*.conf</filename></para>
+ <para><filename>&pkgsysconfdir;/timesyncd.conf</filename></para>
+ <para><filename>&pkgsysconfdir;/timesyncd.conf.d/*.conf</filename></para>
<para><filename>/run/systemd/timesyncd.conf.d/*.conf</filename></para>
- <para><filename>/usr/lib/systemd/timesyncd.conf.d/*.conf</filename></para>
+ <para><filename>&rootlibexecdir;/timesyncd.conf.d/*.conf</filename></para>
</refsynopsisdiv>

<refsect1>
diff --git a/man/tmpfiles.d.xml b/man/tmpfiles.d.xml
index 8d3ed37..c37de65 100644
--- a/man/tmpfiles.d.xml
+++ b/man/tmpfiles.d.xml
@@ -1,6 +1,9 @@
<?xml version="1.0"?>
<!--*-nxml-*-->
-<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
+<!ENTITY % entities SYSTEM "custom-entities.ent" >
+%entities;
+]>
<!--
This file is part of systemd.

diff --git a/man/udev.conf.xml b/man/udev.conf.xml
index e104e53..a10cc3c 100644
--- a/man/udev.conf.xml
+++ b/man/udev.conf.xml
@@ -1,6 +1,9 @@
<?xml version='1.0'?>
<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
- "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
+ "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
+<!ENTITY % entities SYSTEM "custom-entities.ent" >
+%entities;
+]>

<!--
This file is part of systemd.
diff --git a/man/udev.xml b/man/udev.xml
index d1a4f61..f7ebaad 100644
--- a/man/udev.xml
+++ b/man/udev.xml
@@ -1,6 +1,9 @@
<?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">
+ "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
+<!ENTITY % entities SYSTEM "custom-entities.ent" >
+%entities;
+]>

<refentry id="udev">
<refentryinfo>
@@ -55,7 +58,7 @@

<refsect1><title>Rules Files</title>
<para>The udev rules are read from the files located in the
- system rules directory <filename>/usr/lib/udev/rules.d</filename>,
+ system rules directory <filename>&udevlibexecdir;/rules.d</filename>,
the volatile runtime directory <filename>/run/udev/rules.d</filename>
and the local administration directory <filename>/etc/udev/rules.d</filename>.
All rules files are collectively sorted and processed in lexical order,
@@ -421,7 +424,7 @@
<listitem>
<para>Execute an external program specified as the assigned
value. If no absolute path is given, the program is expected
- to live in <filename>/usr/lib/udev</filename>; otherwise, the
+ to live in <filename>&udevlibexecdir;</filename>; otherwise, the
absolute path must be specified.</para>
<para>This is the default if no <replaceable>type</replaceable>
is specified.</para>
diff --git a/man/udevadm.xml b/man/udevadm.xml
index 8ef9e23..c7ef727 100644
--- a/man/udevadm.xml
+++ b/man/udevadm.xml
@@ -1,6 +1,9 @@
<?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">
+ "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
+<!ENTITY % entities SYSTEM "custom-entities.ent" >
+%entities;
+]>

<refentry id="udevadm">
<refentryinfo>
diff --git a/man/user-system-options.xml b/man/user-system-options.xml
index 8616c54..1e415dd 100644
--- a/man/user-system-options.xml
+++ b/man/user-system-options.xml
@@ -1,6 +1,9 @@
<?xml version="1.0"?>
<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
- "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
+ "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+<!ENTITY % entities SYSTEM "custom-entities.ent" >
+%entities;
+]>

<variablelist>
<varlistentry id='user'>
diff --git a/man/vconsole.conf.xml b/man/vconsole.conf.xml
index 27196d4..1c3bdd2 100644
--- a/man/vconsole.conf.xml
+++ b/man/vconsole.conf.xml
@@ -1,6 +1,9 @@
<?xml version='1.0'?> <!--*-nxml-*-->
<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
- "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
+ "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
+<!ENTITY % entities SYSTEM "custom-entities.ent" >
+%entities;
+]>

<!--
This file is part of systemd.
--
2.4.1
Lennart Poettering
2015-05-27 13:04:05 UTC
Permalink
Post by Filipe Brandenburger
As suggested by Martin Pitt, for better support of distros with non-merged /usr.
This doesn't get us 100% there but I'd say it gets us much closer.
Hmm, any chance we can somehow define those entities without having to
add

<!ENTITY % entities SYSTEM "custom-entities.ent" >
%entities;
]>

To each file? Can't we tell xsltproc about this via some command line
switch or so?

This is in a way similar to how we use gcc's "-include config.h"
switch rather than really write "#include <config.h>" in each source
file...

Lennart
--
Lennart Poettering, Red Hat
Daniel Mack
2015-05-27 13:33:38 UTC
Permalink
Post by Lennart Poettering
Hmm, any chance we can somehow define those entities without having to
add
<!ENTITY % entities SYSTEM "custom-entities.ent" >
%entities;
]>
To each file? Can't we tell xsltproc about this via some command line
switch or so?
This is in a way similar to how we use gcc's "-include config.h"
switch rather than really write "#include <config.h>" in each source
file...
I've looked for some way to do this, but haven't found a nice solution
yet. The problem is that the full XML tag is:

<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
<!ENTITY % entities SYSTEM "custom-entities.ent" >
%entities;
]>

So that !ENTITY tag needs to live inside the !DOCTYPE tag, which is not
something you can achieve with a command line switch AFAICS.

We could maybe add some hack to the xsl we feed xsltproc with, but
frankly, the above is the common way of including files to define own
entities, so it'd consider that more readable, even though it's a bit
more boilerplate.


Daniel
Filipe Brandenburger
2015-05-27 14:50:59 UTC
Permalink
Hi,

On Wed, May 27, 2015 at 6:04 AM, Lennart Poettering
Post by Lennart Poettering
Hmm, any chance we can somehow define those entities without having to
add
<!ENTITY % entities SYSTEM "custom-entities.ent" >
%entities;
]>
To each file? Can't we tell xsltproc about this via some command line
switch or so?
I don't think that's possible, in part I believe because XML wants the
documents to be completely described by their doctype and having
external "magic" includes would break that promise.

In particular, two man pages were using this exact same snippet before
my patch: systemd.generator.xml and systemd.unit.xml (though the
latter didn't seem to use any of the named entities at that point...)

Cheers,
Filipe
Lennart Poettering
2015-05-28 17:35:01 UTC
Permalink
Post by Filipe Brandenburger
As suggested by Martin Pitt, for better support of distros with non-merged /usr.
This doesn't get us 100% there but I'd say it gets us much closer.
I think we still need a new variable for /etc/udev (similar to &pkgsysconfdir;
which is /etc/systemd) though that is not really critical for non-merged /usr.
There are also some general explanations (in files man/hwdb.xml, man/udev.xml
and man/systemd.{link,netdev,network}.xml) which talk of how files in /etc
override those in /usr/lib but we don't really have a great variable for
/usr/lib or /lib vs. /etc, so I'd like to think a little further on how to
solve that particular one...
I hope that's helpful!
Applied both!

Thanks!
Post by Filipe Brandenburger
Cheers,
Filipe
man: generate configured paths in manpages
man: use configured path for mount and umount binaries in manpages
Makefile.am | 2 ++
man/binfmt.d.xml | 5 ++++-
man/bootchart.conf.xml | 17 +++++++++-------
man/bootctl.xml | 5 ++++-
man/bootup.xml | 5 ++++-
man/busctl.xml | 5 ++++-
man/coredump.conf.xml | 11 ++++++----
man/coredumpctl.xml | 5 ++++-
man/crypttab.xml | 5 ++++-
man/daemon.xml | 5 ++++-
man/file-hierarchy.xml | 5 ++++-
man/halt.xml | 5 ++++-
man/hostname.xml | 5 ++++-
man/hostnamectl.xml | 5 ++++-
man/hwdb.xml | 9 ++++++---
man/journal-remote.conf.xml | 11 ++++++----
man/journalctl.xml | 5 ++++-
man/journald.conf.xml | 11 ++++++----
man/kernel-command-line.xml | 5 ++++-
man/kernel-install.xml | 5 ++++-
man/less-variables.xml | 5 ++++-
man/libsystemd-pkgconfig.xml | 5 ++++-
man/locale.conf.xml | 5 ++++-
man/localectl.xml | 5 ++++-
man/localtime.xml | 5 ++++-
man/loginctl.xml | 5 ++++-
man/logind.conf.xml | 11 ++++++----
man/machine-id.xml | 5 ++++-
man/machine-info.xml | 5 ++++-
man/machinectl.xml | 9 ++++++---
man/modules-load.d.xml | 5 ++++-
man/networkctl.xml | 5 ++++-
man/nss-myhostname.xml | 5 ++++-
man/nss-mymachines.xml | 5 ++++-
man/os-release.xml | 5 ++++-
man/pam_systemd.xml | 5 ++++-
man/resolved.conf.xml | 11 ++++++----
man/runlevel.xml | 5 ++++-
man/sd-daemon.xml | 5 ++++-
man/sd-id128.xml | 5 ++++-
man/sd-journal.xml | 5 ++++-
man/sd-login.xml | 5 ++++-
man/sd_booted.xml | 5 ++++-
man/sd_bus_creds_get_pid.xml | 5 ++++-
man/sd_bus_creds_new_from_pid.xml | 5 ++++-
man/sd_bus_default.xml | 5 ++++-
man/sd_bus_error.xml | 5 ++++-
man/sd_bus_message_append.xml | 5 ++++-
man/sd_bus_message_append_array.xml | 5 ++++-
man/sd_bus_message_append_basic.xml | 5 ++++-
man/sd_bus_message_append_string_memfd.xml | 5 ++++-
man/sd_bus_message_append_strv.xml | 5 ++++-
man/sd_bus_message_get_cookie.xml | 5 ++++-
man/sd_bus_message_get_monotonic_usec.xml | 5 ++++-
man/sd_bus_negotiate_fds.xml | 5 ++++-
man/sd_bus_new.xml | 5 ++++-
man/sd_bus_path_encode.xml | 5 ++++-
man/sd_bus_request_name.xml | 5 ++++-
man/sd_event_add_child.xml | 5 ++++-
man/sd_event_add_defer.xml | 5 ++++-
man/sd_event_add_signal.xml | 5 ++++-
man/sd_event_add_time.xml | 5 ++++-
man/sd_event_get_fd.xml | 5 ++++-
man/sd_event_new.xml | 5 ++++-
man/sd_event_run.xml | 5 ++++-
man/sd_event_set_name.xml | 5 ++++-
man/sd_event_wait.xml | 5 ++++-
man/sd_get_seats.xml | 5 ++++-
man/sd_id128_get_machine.xml | 5 ++++-
man/sd_id128_randomize.xml | 5 ++++-
man/sd_id128_to_string.xml | 5 ++++-
man/sd_is_fifo.xml | 5 ++++-
man/sd_journal_add_match.xml | 5 ++++-
man/sd_journal_get_catalog.xml | 5 ++++-
man/sd_journal_get_cursor.xml | 5 ++++-
man/sd_journal_get_cutoff_realtime_usec.xml | 5 ++++-
man/sd_journal_get_data.xml | 5 ++++-
man/sd_journal_get_fd.xml | 5 ++++-
man/sd_journal_get_realtime_usec.xml | 5 ++++-
man/sd_journal_get_usage.xml | 5 ++++-
man/sd_journal_next.xml | 5 ++++-
man/sd_journal_open.xml | 5 ++++-
man/sd_journal_print.xml | 5 ++++-
man/sd_journal_query_unique.xml | 5 ++++-
man/sd_journal_seek_head.xml | 5 ++++-
man/sd_journal_stream_fd.xml | 5 ++++-
man/sd_listen_fds.xml | 5 ++++-
man/sd_login_monitor_new.xml | 5 ++++-
man/sd_machine_get_class.xml | 5 ++++-
man/sd_notify.xml | 5 ++++-
man/sd_pid_get_session.xml | 5 ++++-
man/sd_seat_get_active.xml | 5 ++++-
man/sd_session_is_active.xml | 5 ++++-
man/sd_uid_get_state.xml | 5 ++++-
man/sd_watchdog_enabled.xml | 5 ++++-
man/shutdown.xml | 5 ++++-
man/standard-conf.xml | 9 ++++++---
man/standard-options.xml | 5 ++++-
man/sysctl.d.xml | 7 +++++--
man/systemctl.xml | 9 ++++++---
man/systemd-activate.xml | 11 ++++++----
man/systemd-analyze.xml | 5 ++++-
man/systemd-ask-password-console.service.xml | 5 ++++-
man/systemd-ask-password.xml | 5 ++++-
man/systemd-binfmt.service.xml | 7 +++++--
man/systemd-bootchart.xml | 13 +++++++-----
man/systemd-bus-proxyd.xml | 7 +++++--
man/systemd-cat.xml | 5 ++++-
man/systemd-cgls.xml | 5 ++++-
man/systemd-cgtop.xml | 5 ++++-
man/systemd-coredump.xml | 7 +++++--
man/systemd-cryptsetup-generator.xml | 7 +++++--
man/systemd-debug-generator.xml | 7 +++++--
man/systemd-delta.xml | 5 ++++-
man/systemd-detect-virt.xml | 5 ++++-
man/systemd-efi-boot-generator.xml | 7 +++++--
man/systemd-escape.xml | 5 ++++-
man/systemd-firstboot.xml | 5 ++++-
man/systemd-fstab-generator.xml | 7 +++++--
man/systemd-getty-generator.xml | 7 +++++--
man/systemd-gpt-auto-generator.xml | 7 +++++--
man/systemd-halt.service.xml | 11 ++++++----
man/systemd-hibernate-resume-generator.xml | 7 +++++--
man/systemd-hostnamed.service.xml | 7 +++++--
man/systemd-hwdb.xml | 7 +++++--
man/systemd-inhibit.xml | 5 ++++-
man/systemd-initctl.service.xml | 7 +++++--
man/systemd-journal-gatewayd.service.xml | 7 +++++--
man/systemd-journal-remote.xml | 5 ++++-
man/systemd-journal-upload.xml | 9 ++++++---
man/systemd-journald.service.xml | 9 ++++++---
man/systemd-localed.service.xml | 7 +++++--
man/systemd-logind.service.xml | 7 +++++--
man/systemd-machine-id-commit.service.xml | 7 +++++--
man/systemd-machine-id-commit.xml | 5 ++++-
man/systemd-machine-id-setup.xml | 5 ++++-
man/systemd-machined.service.xml | 7 +++++--
man/systemd-modules-load.service.xml | 7 +++++--
man/systemd-networkd-wait-online.service.xml | 7 +++++--
man/systemd-networkd.service.xml | 11 ++++++----
man/systemd-notify.xml | 5 ++++-
man/systemd-nspawn.xml | 5 ++++-
man/systemd-path.xml | 5 ++++-
man/systemd-quotacheck.service.xml | 7 +++++--
man/systemd-random-seed.service.xml | 7 +++++--
man/systemd-remount-fs.service.xml | 7 +++++--
man/systemd-resolved.service.xml | 7 +++++--
man/systemd-run.xml | 5 ++++-
man/systemd-sleep.conf.xml | 13 +++++++-----
man/systemd-socket-proxyd.xml | 9 ++++++---
man/systemd-suspend.service.xml | 13 +++++++-----
man/systemd-sysctl.service.xml | 7 +++++--
man/systemd-system-update-generator.xml | 7 +++++--
man/systemd-system.conf.xml | 17 +++++++++-------
man/systemd-sysusers.xml | 5 ++++-
man/systemd-sysv-generator.xml | 7 +++++--
man/systemd-timedated.service.xml | 7 +++++--
man/systemd-timesyncd.service.xml | 7 +++++--
man/systemd-tmpfiles.xml | 5 ++++-
man/systemd-tty-ask-password-agent.xml | 5 ++++-
man/systemd-udevd.service.xml | 7 +++++--
man/systemd-update-done.service.xml | 7 +++++--
man/systemd-update-utmp.service.xml | 7 +++++--
man/systemd-user-sessions.service.xml | 7 +++++--
man/systemd-vconsole-setup.service.xml | 7 +++++--
man/systemd.automount.xml | 5 ++++-
man/systemd.device.xml | 5 ++++-
man/systemd.exec.xml | 5 ++++-
man/systemd.generator.xml | 4 ++--
man/systemd.journal-fields.xml | 5 ++++-
man/systemd.kill.xml | 5 ++++-
man/systemd.link.xml | 11 ++++++----
man/systemd.mount.xml | 5 ++++-
man/systemd.netdev.xml | 27 ++++++++++++++-----------
man/systemd.network.xml | 25 +++++++++++++----------
man/systemd.path.xml | 5 ++++-
man/systemd.preset.xml | 21 ++++++++++---------
man/systemd.resource-control.xml | 5 ++++-
man/systemd.scope.xml | 5 ++++-
man/systemd.service.xml | 5 ++++-
man/systemd.slice.xml | 5 ++++-
man/systemd.snapshot.xml | 5 ++++-
man/systemd.socket.xml | 5 ++++-
man/systemd.special.xml | 5 ++++-
man/systemd.swap.xml | 5 ++++-
man/systemd.target.xml | 5 ++++-
man/systemd.time.xml | 5 ++++-
man/systemd.timer.xml | 5 ++++-
man/systemd.unit.xml | 30 ++++++++++++++--------------
man/systemd.xml | 7 +++++--
man/sysusers.d.xml | 5 ++++-
man/telinit.xml | 5 ++++-
man/timedatectl.xml | 9 ++++++---
man/timesyncd.conf.xml | 11 ++++++----
man/tmpfiles.d.xml | 5 ++++-
man/udev.conf.xml | 5 ++++-
man/udev.xml | 9 ++++++---
man/udevadm.xml | 5 ++++-
man/user-system-options.xml | 5 ++++-
man/vconsole.conf.xml | 5 ++++-
206 files changed, 973 insertions(+), 362 deletions(-)
--
2.4.1
_______________________________________________
systemd-devel mailing list
http://lists.freedesktop.org/mailman/listinfo/systemd-devel
Lennart
--
Lennart Poettering, Red Hat
Martin Pitt
2015-05-28 17:41:52 UTC
Permalink
Hey Filipe,
Post by Lennart Poettering
Post by Filipe Brandenburger
As suggested by Martin Pitt, for better support of distros with non-merged /usr.
This doesn't get us 100% there but I'd say it gets us much closer.
I think we still need a new variable for /etc/udev (similar to &pkgsysconfdir;
which is /etc/systemd) though that is not really critical for non-merged /usr.
There are also some general explanations (in files man/hwdb.xml, man/udev.xml
and man/systemd.{link,netdev,network}.xml) which talk of how files in /etc
override those in /usr/lib but we don't really have a great variable for
/usr/lib or /lib vs. /etc, so I'd like to think a little further on how to
solve that particular one...
I hope that's helpful!
Applied both!
\o/ Many thanks Filipe, that's great! Biggest patch gone :)

Martin
--
Martin Pitt | http://www.piware.de
Ubuntu Developer (www.ubuntu.com) | Debian Developer (www.debian.org)
Michael Biebl
2015-05-28 17:44:06 UTC
Permalink
Post by Martin Pitt
Post by Lennart Poettering
Post by Filipe Brandenburger
I hope that's helpful!
Applied both!
\o/ Many thanks Filipe, that's great! Biggest patch gone :)
A huge thanks from me as well to everyone involved!
--
Why is it that all of the instruments seeking intelligent life in the
universe are pointed away from Earth?
Filipe Brandenburger
2015-05-28 17:47:46 UTC
Permalink
Post by Michael Biebl
Post by Martin Pitt
\o/ Many thanks Filipe, that's great! Biggest patch gone :)
A huge thanks from me as well to everyone involved!
Lennart: Thanks for applying it.

Martin and Michael: You're welcome, glad to help!

We're actually still missing a small part of it (A sentence like
"Files in /etc have the highest priority, files in /run take
precedence over files with the same name in */usr/lib*." in files like
hwdb.xml, the last /usr/lib won't get fixed) but it requires new
variables. I'm leaning towards introducing a rootsysconfdir=/etc and
rootlibdir=$(rootprefix)/lib (we already have a rootbindir) so I'll
follow up with a patch doing that.

Though having the first patchset in certainly helps.

Cheers!
Filipe
Michael Biebl
2015-05-29 03:18:23 UTC
Permalink
Post by Filipe Brandenburger
We're actually still missing a small part of it (A sentence like
"Files in /etc have the highest priority, files in /run take
precedence over files with the same name in */usr/lib*." in files like
hwdb.xml, the last /usr/lib won't get fixed) but it requires new
variables. I'm leaning towards introducing a rootsysconfdir=/etc and
rootlibdir=$(rootprefix)/lib (we already have a rootbindir) so I'll
follow up with a patch doing that.
Though having the first patchset in certainly helps.
Indeed. I just ran my small shell script which I used to generate the
original diff over current git head.
The only occurences which it still replaces can be found at [1].
It's like you said, the override bits which are still missing.
Otherwise it looks fine.

Michael


[1] http://paste.debian.net/186665/
--
Why is it that all of the instruments seeking intelligent life in the
universe are pointed away from Earth?
Daniel Mack
2015-05-29 09:05:12 UTC
Permalink
Post by Michael Biebl
Post by Filipe Brandenburger
We're actually still missing a small part of it (A sentence like
"Files in /etc have the highest priority, files in /run take
precedence over files with the same name in */usr/lib*." in files like
hwdb.xml, the last /usr/lib won't get fixed) but it requires new
variables. I'm leaning towards introducing a rootsysconfdir=/etc and
rootlibdir=$(rootprefix)/lib (we already have a rootbindir) so I'll
follow up with a patch doing that.
Though having the first patchset in certainly helps.
Indeed. I just ran my small shell script which I used to generate the
original diff over current git head.
The only occurences which it still replaces can be found at [1].
It's like you said, the override bits which are still missing.
Otherwise it looks fine.
Could you try the attached patch?

I had to introduce a new entity in custom-entites.ent, because with
"--with-rootprefix=/", "&rootprefix;/lib" resolves to "//lib", and with
the default behaviour of configure, "&rootprefix;lib" becomes "/usrlib".

That is solved with a subsitiution in Makefile.am now, which cleans up
all double slashes in custom-entites.ent.


Thanks,
Daniel
Lennart Poettering
2015-05-29 16:58:51 UTC
Permalink
Post by Daniel Mack
Post by Michael Biebl
Post by Filipe Brandenburger
We're actually still missing a small part of it (A sentence like
"Files in /etc have the highest priority, files in /run take
precedence over files with the same name in */usr/lib*." in files like
hwdb.xml, the last /usr/lib won't get fixed) but it requires new
variables. I'm leaning towards introducing a rootsysconfdir=/etc and
rootlibdir=$(rootprefix)/lib (we already have a rootbindir) so I'll
follow up with a patch doing that.
Though having the first patchset in certainly helps.
Indeed. I just ran my small shell script which I used to generate the
original diff over current git head.
The only occurences which it still replaces can be found at [1].
It's like you said, the override bits which are still missing.
Otherwise it looks fine.
Could you try the attached patch?
I had to introduce a new entity in custom-entites.ent, because with
"--with-rootprefix=/", "&rootprefix;/lib" resolves to "//lib", and with
the default behaviour of configure, "&rootprefix;lib" becomes "/usrlib".
That is solved with a subsitiution in Makefile.am now, which cleans up
all double slashes in custom-entites.ent.
Patch looks fine to me. Didn't test it though, Michael, Filipe or
Martin should probably try that...

Lennart
--
Lennart Poettering, Red Hat
Filipe Brandenburger
2015-05-29 17:37:23 UTC
Permalink
Hi Daniel,

I haven't tested it, but I do have a few comments.

First, why not use "rootlibdir" instead of "rootprefixlibdir"? There's
already similar "rootbindir" and "rootlibexecdir" defined there, so I
think we could stick to the same convention.

From a few lines down in Makefile.am:

# And these are the special ones for /
rootprefix=@rootprefix@
rootbindir=$(rootprefix)/bin
rootlibexecdir=$(rootprefix)/lib/systemd
Post by Daniel Mack
I had to introduce a new entity in custom-entites.ent, because with
"--with-rootprefix=/", "&rootprefix;/lib" resolves to "//lib", and with
the default behaviour of configure, "&rootprefix;lib" becomes "/usrlib".
Debian is already using --with-rootprefix= (an empty string) exactly
for that reason.
http://anonscm.debian.org/cgit/pkg-systemd/systemd.git/tree/debian/rules#n16

If rootprefix=/, there would be also problems with rootbindir=//bin
and other such definitions getting double slashes.

Having said that, I do agree that it would be nice to handle
--with-rootprefix=/ correctly without creating double slashes, but I
think it would be preferrable to handle that in general and not for
the specific case of /lib.

Perhaps just remove any trailing slashes from rootprefix in
configure.ac instead before generating the Makefile? That would also
handle cases like --with-rootprefix=/usr/ to still generate /usr/bin
and /usr/lib correctly.

In any case, handling trailing slashes/double slashes could come on a
separate patch. As pointed out, the problem with it already exists and
Debian is working around it by setting rootprefix to an empty string,
so it's not really strictly required for the rootlibdir patch itself.

I'd be glad to test a new patchset that addresses these suggestions.

Cheers,
Filipe
Daniel Mack
2015-05-30 00:03:47 UTC
Permalink
Post by Filipe Brandenburger
I haven't tested it, but I do have a few comments.
First, why not use "rootlibdir" instead of "rootprefixlibdir"?
Because $(rootlibdir) resolves to /usr/lib64 on my system.

[...]
Post by Filipe Brandenburger
Post by Daniel Mack
I had to introduce a new entity in custom-entites.ent, because with
"--with-rootprefix=/", "&rootprefix;/lib" resolves to "//lib", and with
the default behaviour of configure, "&rootprefix;lib" becomes "/usrlib".
Debian is already using --with-rootprefix= (an empty string) exactly
for that reason.
http://anonscm.debian.org/cgit/pkg-systemd/systemd.git/tree/debian/rules#n16
Interesting, thanks for the pointer.
Post by Filipe Brandenburger
If rootprefix=/, there would be also problems with rootbindir=//bin
and other such definitions getting double slashes.
Having said that, I do agree that it would be nice to handle
--with-rootprefix=/ correctly without creating double slashes, but I
think it would be preferrable to handle that in general and not for
the specific case of /lib.
Yes, the subst logic I added replaces _all_ leading double slashes, and
hence avoids touching URLs with "http://".
Post by Filipe Brandenburger
Perhaps just remove any trailing slashes from rootprefix in
configure.ac instead before generating the Makefile? That would also
handle cases like --with-rootprefix=/usr/ to still generate /usr/bin
and /usr/lib correctly.
Yes, that's actually better, you're right. I'll post a patch for this.


Thanks,
Daniel
Daniel Mack
2015-05-30 00:05:32 UTC
Permalink
Make sure the variable set via --with-rootprefix= does not contain a
trailing slash, so man pages can use entities like "&rootprefix;/lib"
without ending up having double slashes.
---
configure.ac | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/configure.ac b/configure.ac
index 92654a6..55b73de 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1396,7 +1396,8 @@ AC_ARG_WITH([zshcompletiondir],

AC_ARG_WITH([rootprefix],
AS_HELP_STRING([--with-rootprefix=DIR], [rootfs directory prefix for config files and kernel modules]),
- [], [with_rootprefix=${ac_default_prefix}])
+ [with_rootprefix=`echo ${withval} | sed -e s,/*$,,`],
+ [with_rootprefix=${ac_default_prefix}])

AC_ARG_WITH([rootlibdir],
AS_HELP_STRING([--with-rootlibdir=DIR], [Root directory for libraries necessary for boot]),
--
2.4.0
Daniel Mack
2015-05-30 00:05:33 UTC
Permalink
Replace some /usr/lib occurences in man/ with &rootprefix;/lib.
---
man/hwdb.xml | 4 ++--
man/systemd.link.xml | 4 ++--
man/systemd.netdev.xml | 4 ++--
man/systemd.network.xml | 4 ++--
man/udev.xml | 4 ++--
5 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/man/hwdb.xml b/man/hwdb.xml
index b3602ac..e6215df 100644
--- a/man/hwdb.xml
+++ b/man/hwdb.xml
@@ -50,10 +50,10 @@
regardless of the directories in which they live. However, files with
identical filenames replace each other. Files in <filename>/etc</filename>
have the highest priority, files in <filename>/run</filename> take precedence
- over files with the same name in <filename>/usr/lib</filename>. This can be
+ over files with the same name in <filename>&rootprefix;/lib</filename>. This can be
used to override a system-supplied hwdb file with a local file if needed;
a symlink in <filename>/etc</filename> with the same name as a hwdb file in
- <filename>/usr/lib</filename>, pointing to <filename>/dev/null</filename>,
+ <filename>&rootprefix;/lib</filename>, pointing to <filename>/dev/null</filename>,
disables the hwdb file entirely. hwdb files must have the extension
<filename>.hwdb</filename>; other extensions are ignored.</para>

diff --git a/man/systemd.link.xml b/man/systemd.link.xml
index 75cf6e1..5db0684 100644
--- a/man/systemd.link.xml
+++ b/man/systemd.link.xml
@@ -70,10 +70,10 @@
However, files with identical filenames replace each other. Files
in <filename>/etc</filename> have the highest priority, files in
<filename>/run</filename> take precedence over files with the same
- name in <filename>/usr/lib</filename>. This can be used to
+ name in <filename>&rootprefix;/lib</filename>. This can be used to
override a system-supplied link file with a local file if needed;
a symlink in <filename>/etc</filename> with the same name as a
- link file in <filename>/usr/lib</filename>, pointing to
+ link file in <filename>&rootprefix;/lib</filename>, pointing to
<filename>/dev/null</filename>, disables the link file
entirely.</para>

diff --git a/man/systemd.netdev.xml b/man/systemd.netdev.xml
index 6cd77ab..786c7d4 100644
--- a/man/systemd.netdev.xml
+++ b/man/systemd.netdev.xml
@@ -81,10 +81,10 @@
identical filenames replace each other. Files in
<filename>/etc</filename> have the highest priority, files in
<filename>/run</filename> take precedence over files with the same
- name in <filename>/usr/lib</filename>. This can be used to
+ name in <filename>&rootprefix;/lib</filename>. This can be used to
override a system-supplied configuration file with a local file if
needed; a symlink in <filename>/etc</filename> with the same name
- as a configuration file in <filename>/usr/lib</filename>, pointing
+ as a configuration file in <filename>&rootprefix;/lib</filename>, pointing
to <filename>/dev/null</filename>, disables the configuration file
entirely.</para>

diff --git a/man/systemd.network.xml b/man/systemd.network.xml
index 0b9781f..bd061c2 100644
--- a/man/systemd.network.xml
+++ b/man/systemd.network.xml
@@ -77,10 +77,10 @@
identical filenames replace each other. Files in
<filename>/etc</filename> have the highest priority, files in
<filename>/run</filename> take precedence over files with the same
- name in <filename>/usr/lib</filename>. This can be used to
+ name in <filename>&rootprefix;/lib</filename>. This can be used to
override a system-supplied configuration file with a local file if
needed; a symlink in <filename>/etc</filename> with the same name
- as a configuration file in <filename>/usr/lib</filename>, pointing
+ as a configuration file in <filename>&rootprefix;/lib</filename>, pointing
to <filename>/dev/null</filename>, disables the configuration file
entirely.</para>

diff --git a/man/udev.xml b/man/udev.xml
index f7ebaad..d5d8a17 100644
--- a/man/udev.xml
+++ b/man/udev.xml
@@ -65,10 +65,10 @@
regardless of the directories in which they live. However, files with
identical filenames replace each other. Files in <filename>/etc</filename>
have the highest priority, files in <filename>/run</filename> take precedence
- over files with the same name in <filename>/usr/lib</filename>. This can be
+ over files with the same name in <filename>&rootprefix;/lib</filename>. This can be
used to override a system-supplied rules file with a local file if needed;
a symlink in <filename>/etc</filename> with the same name as a rules file in
- <filename>/usr/lib</filename>, pointing to <filename>/dev/null</filename>,
+ <filename>&rootprefix;/lib</filename>, pointing to <filename>/dev/null</filename>,
disables the rules file entirely. Rule files must have the extension
<filename>.rules</filename>; other extensions are ignored.</para>
--
2.4.0
systemd github import bot
2015-05-30 01:02:10 UTC
Permalink
Patchset imported to github.
Pull request:
<https://github.com/systemd-devs/systemd/compare/master...systemd-mailing-devs:1432944333-3566-2-git-send-email-daniel%40zonque.org>

--
Generated by https://github.com/haraldh/mail2git
Michael Biebl
2015-05-30 00:21:26 UTC
Permalink
Post by Daniel Mack
Make sure the variable set via --with-rootprefix= does not contain a
trailing slash, so man pages can use entities like "&rootprefix;/lib"
without ending up having double slashes.
---
configure.ac | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/configure.ac b/configure.ac
index 92654a6..55b73de 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1396,7 +1396,8 @@ AC_ARG_WITH([zshcompletiondir],
AC_ARG_WITH([rootprefix],
AS_HELP_STRING([--with-rootprefix=DIR], [rootfs directory prefix for config files and kernel modules]),
- [], [with_rootprefix=${ac_default_prefix}])
+ [with_rootprefix=`echo ${withval} | sed -e s,/*$,,`],
+ [with_rootprefix=${ac_default_prefix}])
AC_ARG_WITH([rootlibdir],
AS_HELP_STRING([--with-rootlibdir=DIR], [Root directory for libraries necessary for boot]),
autoconf already strips trailing slashes for all default directory
variables [1].
I think we should do the same for *all* our custom --with-$foo-dir
variables, not just rootlibdir.

Maybe provide a custom macro for that and apply that to

--with-html-dir=PATH path to installed docs
--with-efi-libdir=PATH Path to EFI lib directory
--with-efi-ldsdir=PATH Path to EFI lds directory
--with-efi-includedir=PATH
--with-dbuspolicydir=DIR
--with-dbussessionservicedir=DIR
--with-dbussystemservicedir=DIR
--with-bashcompletiondir=DIR
--with-zshcompletiondir=DIR
--with-rootprefix=DIR rootfs directory prefix for config files and kernel
--with-rootlibdir=DIR Root directory for libraries necessary for boot
--with-pamlibdir=DIR Directory for PAM modules
--with-pamconfdir=DIR Directory for PAM configuration

WDYT?

[1] http://comments.gmane.org/gmane.comp.sysutils.autoconf.bugs/5747
--
Why is it that all of the instruments seeking intelligent life in the
universe are pointed away from Earth?
Daniel Mack
2015-05-30 00:24:32 UTC
Permalink
Post by Michael Biebl
Post by Daniel Mack
Make sure the variable set via --with-rootprefix= does not contain a
trailing slash, so man pages can use entities like "&rootprefix;/lib"
without ending up having double slashes.
---
configure.ac | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/configure.ac b/configure.ac
index 92654a6..55b73de 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1396,7 +1396,8 @@ AC_ARG_WITH([zshcompletiondir],
AC_ARG_WITH([rootprefix],
AS_HELP_STRING([--with-rootprefix=DIR], [rootfs directory prefix for config files and kernel modules]),
- [], [with_rootprefix=${ac_default_prefix}])
+ [with_rootprefix=`echo ${withval} | sed -e s,/*$,,`],
+ [with_rootprefix=${ac_default_prefix}])
AC_ARG_WITH([rootlibdir],
AS_HELP_STRING([--with-rootlibdir=DIR], [Root directory for libraries necessary for boot]),
autoconf already strips trailing slashes for all default directory
variables [1].
I think we should do the same for *all* our custom --with-$foo-dir
variables, not just rootlibdir.
Maybe provide a custom macro for that and apply that to
--with-html-dir=PATH path to installed docs
--with-efi-libdir=PATH Path to EFI lib directory
--with-efi-ldsdir=PATH Path to EFI lds directory
--with-efi-includedir=PATH
--with-dbuspolicydir=DIR
--with-dbussessionservicedir=DIR
--with-dbussystemservicedir=DIR
--with-bashcompletiondir=DIR
--with-zshcompletiondir=DIR
--with-rootprefix=DIR rootfs directory prefix for config files and kernel
--with-rootlibdir=DIR Root directory for libraries necessary for boot
--with-pamlibdir=DIR Directory for PAM modules
--with-pamconfdir=DIR Directory for PAM configuration
WDYT?
Fine for me, just go ahead if you have an implementation in mind :)


Thanks,
Daniel
Michael Biebl
2015-05-30 00:50:28 UTC
Permalink
Post by Daniel Mack
Fine for me, just go ahead if you have an implementation in mind :)
I was lazy and just copied
ftp://ftp.tu-clausthal.de/pub/mirror/gnu/www/software/ac-archive/normpath.html
The resulting diff would look something like

diff --git a/configure.ac b/configure.ac
index 92654a6..815c8af 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1397,11 +1397,13 @@ AC_ARG_WITH([zshcompletiondir],
AC_ARG_WITH([rootprefix],
AS_HELP_STRING([--with-rootprefix=DIR], [rootfs directory
prefix for config files and kernel modules]),
[], [with_rootprefix=${ac_default_prefix}])
+adl_NORMALIZE_PATH([with_rootprefix])

AC_ARG_WITH([rootlibdir],
AS_HELP_STRING([--with-rootlibdir=DIR], [Root directory for
libraries necessary for boot]),
[],
[with_rootlibdir=${libdir}])
+adl_NORMALIZE_PATH([with_rootlibdir])

AC_ARG_WITH([pamlibdir],
AS_HELP_STRING([--with-pamlibdir=DIR], [Directory for PAM modules]),
diff --git a/m4/normpath.m4 b/m4/normpath.m4
new file mode 100644
index 0000000..5b29488
--- /dev/null
+++ b/m4/normpath.m4
@@ -0,0 +1,15 @@
+AC_DEFUN([adl_NORMALIZE_PATH],
+[case ":[$]$1:" in
+# change empty paths to '.'
+ ::) $1='.' ;;
+# strip trailing slashes
+ :*[[\\/]]:) $1=`echo "[$]$1" | sed 's,[[\\/]]*[$],,'` ;;
+ :*:) ;;
+esac
+# squeze repeated slashes
+case ifelse($2,,"[$]$1",$2) in
+# if the path contains any backslashes, turn slashes into backslashes
+ *\\*) $1=`echo "[$]$1" | sed 's,\(.\)[[\\/]][[\\/]]*,\1\\\\,g'` ;;
+# if the path contains slashes, also turn backslashes into slashes
+ *) $1=`echo "[$]$1" | sed 's,\(.\)[[\\/]][[\\/]]*,\1/,g'` ;;
+esac])


This would need to be extended all remaining dirs.
--
Why is it that all of the instruments seeking intelligent life in the
universe are pointed away from Earth?
Michael Biebl
2015-05-30 00:53:52 UTC
Permalink
Post by Michael Biebl
Post by Daniel Mack
Fine for me, just go ahead if you have an implementation in mind :)
I was lazy and just copied
ftp://ftp.tu-clausthal.de/pub/mirror/gnu/www/software/ac-archive/normpath.html
Oh, I just noticed there is a sort-of official macro for that, already
provided in Debian as
/usr/share/aclocal/ax_normalize_path.m4

It's shipped as part of autoconf-archive.
--
Why is it that all of the instruments seeking intelligent life in the
universe are pointed away from Earth?
Michael Biebl
2015-05-30 01:04:55 UTC
Permalink
Post by Michael Biebl
Post by Michael Biebl
Post by Daniel Mack
Fine for me, just go ahead if you have an implementation in mind :)
I was lazy and just copied
ftp://ftp.tu-clausthal.de/pub/mirror/gnu/www/software/ac-archive/normpath.html
Oh, I just noticed there is a sort-of official macro for that, already
provided in Debian as
/usr/share/aclocal/ax_normalize_path.m4
It's shipped as part of autoconf-archive.
I we assume, autconf-archive is installed, the resulting patch would
look like the attached diff.
For convenience sake, we could also ship a copy of
/usr/share/aclocal/ax_normalize_path.m4 in our m4/ directory.

Michael
--
Why is it that all of the instruments seeking intelligent life in the
universe are pointed away from Earth?
Filipe Brandenburger
2015-05-30 06:19:35 UTC
Permalink
Hi,
Post by Michael Biebl
I we assume, autconf-archive is installed, the resulting patch would
look like the attached diff.
For convenience sake, we could also ship a copy of
/usr/share/aclocal/ax_normalize_path.m4 in our m4/ directory.
Yep... indeed autoconf-archive is the way to go.

I tested your patch with some configure options and confirmed it works
as expected. I also checked that it doesn't break distcheck or
anything, so I think it's good to go...

I'll resend it here including the embedded autoconf-archive file in a
format that's ready for git am.

Cheers,
Filipe
Filipe Brandenburger
2015-05-30 06:21:30 UTC
Permalink
From: Michael Biebl <***@debian.org>

Strip trailing slashes from options such as --with-rootprefix, so that building
with rootprefix="/" results in paths like "/lib" instead of "//lib".

Also handle paths such as "/usr/" gracefully.

Use m4/ax_normalize_path.m4 from the autoconf-archive project, which is now
included in our tree as per usual practices in using autoconf-archive macros.

Tested with the following configure options:
./configure \
--with-rootprefix=/ \
--with-rootlibdir=/lib64/ \
--prefix=/usr/ \
--libdir=/lib/ \
--with-bashcompletiondir=/bash-completion/completions/

(The "prefix" and "libdir" are already automatically normalized by Autoconf,
this command is testing the others.)

Compared the config.log and resulting trees (in particular man pages) to
confirm double slashes were not present in the latter.

Also tested that a configuration using default options is not affected and that
`make distcheck` still works as expected.
---
configure.ac | 9 ++++
m4/ax_normalize_path.m4 | 115 ++++++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 124 insertions(+)
create mode 100644 m4/ax_normalize_path.m4

diff --git a/configure.ac b/configure.ac
index 92654a6..78d52e4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1370,16 +1370,19 @@ AC_ARG_WITH([dbuspolicydir],
AS_HELP_STRING([--with-dbuspolicydir=DIR], [D-Bus policy directory]),
[],
[with_dbuspolicydir=${sysconfdir}/dbus-1/system.d])
+AX_NORMALIZE_PATH([with_dbuspolicydir])

AC_ARG_WITH([dbussessionservicedir],
AS_HELP_STRING([--with-dbussessionservicedir=DIR], [D-Bus session service directory]),
[],
[with_dbussessionservicedir=${datadir}/dbus-1/services])
+AX_NORMALIZE_PATH([with_dbussessionservicedir])

AC_ARG_WITH([dbussystemservicedir],
AS_HELP_STRING([--with-dbussystemservicedir=DIR], [D-Bus system service directory]),
[],
[with_dbussystemservicedir=${datadir}/dbus-1/system-services])
+AX_NORMALIZE_PATH([with_dbussystemservicedir])

AC_ARG_WITH([bashcompletiondir],
AS_HELP_STRING([--with-bashcompletiondir=DIR], [Bash completions directory]),
@@ -1389,29 +1392,35 @@ AC_ARG_WITH([bashcompletiondir],
] , [
with_bashcompletiondir=${datadir}/bash-completion/completions
])])
+AX_NORMALIZE_PATH([with_bashcompletiondir])

AC_ARG_WITH([zshcompletiondir],
AS_HELP_STRING([--with-zshcompletiondir=DIR], [Zsh completions directory]),
[], [with_zshcompletiondir=${datadir}/zsh/site-functions])
+AX_NORMALIZE_PATH([with_zshcompletiondir])

AC_ARG_WITH([rootprefix],
AS_HELP_STRING([--with-rootprefix=DIR], [rootfs directory prefix for config files and kernel modules]),
[], [with_rootprefix=${ac_default_prefix}])
+AX_NORMALIZE_PATH([with_rootprefix])

AC_ARG_WITH([rootlibdir],
AS_HELP_STRING([--with-rootlibdir=DIR], [Root directory for libraries necessary for boot]),
[],
[with_rootlibdir=${libdir}])
+AX_NORMALIZE_PATH([with_rootlibdir])

AC_ARG_WITH([pamlibdir],
AS_HELP_STRING([--with-pamlibdir=DIR], [Directory for PAM modules]),
[],
[with_pamlibdir=${with_rootlibdir}/security])
+AX_NORMALIZE_PATH([with_pamlibdir])

AC_ARG_WITH([pamconfdir],
AS_HELP_STRING([--with-pamconfdir=DIR], [Directory for PAM configuration]),
[],
[with_pamconfdir=${sysconfdir}/pam.d])
+AX_NORMALIZE_PATH([with_pamconfdir])

AC_ARG_ENABLE([split-usr],
AS_HELP_STRING([--enable-split-usr], [Assume that /bin, /sbin aren\'t symlinks into /usr]),
diff --git a/m4/ax_normalize_path.m4 b/m4/ax_normalize_path.m4
new file mode 100644
index 0000000..e8f9973
--- /dev/null
+++ b/m4/ax_normalize_path.m4
@@ -0,0 +1,115 @@
+# ===========================================================================
+# http://www.gnu.org/software/autoconf-archive/ax_normalize_path.html
+# ===========================================================================
+#
+# SYNOPSIS
+#
+# AX_NORMALIZE_PATH(VARNAME, [REFERENCE_STRING])
+#
+# DESCRIPTION
+#
+# Perform some cleanups on the value of $VARNAME (interpreted as a path):
+#
+# - empty paths are changed to '.'
+# - trailing slashes are removed
+# - repeated slashes are squeezed except a leading doubled slash '//'
+# (which might indicate a networked disk on some OS).
+#
+# REFERENCE_STRING is used to turn '/' into '\' and vice-versa: if
+# REFERENCE_STRING contains some backslashes, all slashes and backslashes
+# are turned into backslashes, otherwise they are all turned into slashes.
+#
+# This makes processing of DOS filenames quite easier, because you can
+# turn a filename to the Unix notation, make your processing, and turn it
+# back to original notation.
+#
+# filename='A:\FOO\\BAR\'
+# old_filename="$filename"
+# # Switch to the unix notation
+# AX_NORMALIZE_PATH([filename], ["/"])
+# # now we have $filename = 'A:/FOO/BAR' and we can process it as if
+# # it was a Unix path. For instance let's say that you want
+# # to append '/subpath':
+# filename="$filename/subpath"
+# # finally switch back to the original notation
+# AX_NORMALIZE_PATH([filename], ["$old_filename"])
+# # now $filename equals to 'A:\FOO\BAR\subpath'
+#
+# One good reason to make all path processing with the unix convention is
+# that backslashes have a special meaning in many cases. For instance
+#
+# expr 'A:\FOO' : 'A:\Foo'
+#
+# will return 0 because the second argument is a regex in which
+# backslashes have to be backslashed. In other words, to have the two
+# strings to match you should write this instead:
+#
+# expr 'A:\Foo' : 'A:\\Foo'
+#
+# Such behavior makes DOS filenames extremely unpleasant to work with. So
+# temporary turn your paths to the Unix notation, and revert them to the
+# original notation after the processing. See the macro
+# AX_COMPUTE_RELATIVE_PATHS for a concrete example of this.
+#
+# REFERENCE_STRING defaults to $VARIABLE, this means that slashes will be
+# converted to backslashes if $VARIABLE already contains some backslashes
+# (see $thirddir below).
+#
+# firstdir='/usr/local//share'
+# seconddir='C:\Program Files\\'
+# thirddir='C:\home/usr/'
+# AX_NORMALIZE_PATH([firstdir])
+# AX_NORMALIZE_PATH([seconddir])
+# AX_NORMALIZE_PATH([thirddir])
+# # $firstdir = '/usr/local/share'
+# # $seconddir = 'C:\Program Files'
+# # $thirddir = 'C:\home\usr'
+#
+# LICENSE
+#
+# Copyright (c) 2008 Alexandre Duret-Lutz <***@gnu.org>
+#
+# This program is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License as published by the
+# Free Software Foundation; either version 2 of the License, or (at your
+# option) any later version.
+#
+# This program 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 General
+# Public License for more details.
+#
+# You should have received a copy of the GNU General Public License along
+# with this program. If not, see <http://www.gnu.org/licenses/>.
+#
+# As a special exception, the respective Autoconf Macro's copyright owner
+# gives unlimited permission to copy, distribute and modify the configure
+# scripts that are the output of Autoconf when processing the Macro. You
+# need not follow the terms of the GNU General Public License when using
+# or distributing such scripts, even though portions of the text of the
+# Macro appear in them. The GNU General Public License (GPL) does govern
+# all other use of the material that constitutes the Autoconf Macro.
+#
+# This special exception to the GPL applies to versions of the Autoconf
+# Macro released by the Autoconf Archive. When you make and distribute a
+# modified version of the Autoconf Macro, you may extend this special
+# exception to the GPL to apply to your modified version as well.
+
+#serial 5
+
+AU_ALIAS([ADL_NORMALIZE_PATH], [AX_NORMALIZE_PATH])
+AC_DEFUN([AX_NORMALIZE_PATH],
+[case ":[$]$1:" in
+# change empty paths to '.'
+ ::) $1='.' ;;
+# strip trailing slashes
+ :*[[\\/]]:) $1=`echo "[$]$1" | sed 's,[[\\/]]*[$],,'` ;;
+ :*:) ;;
+esac
+# squeze repeated slashes
+case ifelse($2,,"[$]$1",$2) in
+# if the path contains any backslashes, turn slashes into backslashes
+ *\\*) $1=`echo "[$]$1" | sed 's,\(.\)[[\\/]][[\\/]]*,\1\\\\,g'` ;;
+# if the path contains slashes, also turn backslashes into slashes
+ *) $1=`echo "[$]$1" | sed 's,\(.\)[[\\/]][[\\/]]*,\1/,g'` ;;
+esac])
--
2.4.2
systemd github import bot
2015-05-30 07:04:11 UTC
Permalink
Patchset imported to github.
Pull request:
<https://github.com/systemd-devs/systemd/compare/master...systemd-mailing-devs:1432966890-8267-1-git-send-email-filbranden%40google.com>

--
Generated by https://github.com/haraldh/mail2git
Filipe Brandenburger
2015-05-30 00:30:05 UTC
Permalink
Post by Michael Biebl
autoconf already strips trailing slashes for all default directory
variables [1].
How does it handle --prefix=/ though? Does it turn it into an empty string?
Post by Michael Biebl
I think we should do the same for *all* our custom --with-$foo-dir
variables, not just rootlibdir.
Agreed.

I think we can go ahead with patch #2 ("man: replace hard-coded
/usr/lib") since it works for both the --with-rootprefix=/usr
(default) case and the --with-rootprefix= (empty) case used by Debian.

Cheers,
Filipe
Michael Biebl
2015-05-30 00:39:54 UTC
Permalink
Post by Filipe Brandenburger
Post by Michael Biebl
autoconf already strips trailing slashes for all default directory
variables [1].
How does it handle --prefix=/ though? Does it turn it into an empty string?
Hm, no, apparently it doesn't. It only strips the trailing '/' when
you use something like --prefix=/usr/
--
Why is it that all of the instruments seeking intelligent life in the
universe are pointed away from Earth?
Mike Gilbert
2015-05-30 06:50:11 UTC
Permalink
Post by Daniel Mack
Make sure the variable set via --with-rootprefix= does not contain a
trailing slash, so man pages can use entities like "&rootprefix;/lib"
without ending up having double slashes.
---
configure.ac | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/configure.ac b/configure.ac
index 92654a6..55b73de 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1396,7 +1396,8 @@ AC_ARG_WITH([zshcompletiondir],
AC_ARG_WITH([rootprefix],
AS_HELP_STRING([--with-rootprefix=DIR], [rootfs directory prefix for config files and kernel modules]),
- [], [with_rootprefix=${ac_default_prefix}])
+ [with_rootprefix=`echo ${withval} | sed -e s,/*$,,`],
+ [with_rootprefix=${ac_default_prefix}])
Why do you pipe it through sed when a simple shell parameter expansion would do?

with_rootprefix=${withval%/}
Daniel Mack
2015-05-30 08:28:51 UTC
Permalink
Post by Mike Gilbert
Post by Daniel Mack
Make sure the variable set via --with-rootprefix= does not contain a
trailing slash, so man pages can use entities like "&rootprefix;/lib"
without ending up having double slashes.
---
configure.ac | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/configure.ac b/configure.ac
index 92654a6..55b73de 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1396,7 +1396,8 @@ AC_ARG_WITH([zshcompletiondir],
AC_ARG_WITH([rootprefix],
AS_HELP_STRING([--with-rootprefix=DIR], [rootfs directory prefix for config files and kernel modules]),
- [], [with_rootprefix=${ac_default_prefix}])
+ [with_rootprefix=`echo ${withval} | sed -e s,/*$,,`],
+ [with_rootprefix=${ac_default_prefix}])
Why do you pipe it through sed when a simple shell parameter expansion would do?
with_rootprefix=${withval%/}
Isn't that's a bash'ism which we try to avoid at other places? FWIW, we
use sed to strip off trailing dashes from $host for EFI_ARCH. Also, that
one only replaces one trailing slash, not all of them.

Anyway, Michael's AX_NORMALIZE_PATH approach seems to do the right
thing, so let's go for that.


Thanks,
Daniel
Christian Seiler
2015-05-30 10:31:30 UTC
Permalink
Post by Daniel Mack
Post by Mike Gilbert
Post by Daniel Mack
Make sure the variable set via --with-rootprefix= does not contain a
trailing slash, so man pages can use entities like "&rootprefix;/lib"
without ending up having double slashes.
---
configure.ac | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/configure.ac b/configure.ac
index 92654a6..55b73de 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1396,7 +1396,8 @@ AC_ARG_WITH([zshcompletiondir],
AC_ARG_WITH([rootprefix],
AS_HELP_STRING([--with-rootprefix=DIR], [rootfs directory prefix for config files and kernel modules]),
- [], [with_rootprefix=${ac_default_prefix}])
+ [with_rootprefix=`echo ${withval} | sed -e s,/*$,,`],
+ [with_rootprefix=${ac_default_prefix}])
Why do you pipe it through sed when a simple shell parameter expansion would do?
with_rootprefix=${withval%/}
Isn't that's a bash'ism which we try to avoid at other places? FWIW, we
use sed to strip off trailing dashes from $host for EFI_ARCH. Also, that
one only replaces one trailing slash, not all of them.
No, it's not a bashism, it's indeed POSIX. See:
http://pubs.opengroup.org/onlinepubs/009695399/utilities/xcu_chap02.html#tag_02_06_02

For example:

V="aXbXc"
printf '%s\n' "${V#*X}"
printf '%s\n' "${V##*X}"
printf '%s\n' "${V%X*}"
printf '%s\n' "${V%%X*}"

When using either one of bash, dash, ash, busybox's shell, mksh, pdksh
and zsh as /bin/sh, it all produces the same output:

bXc
c
aXb
a

The following are bashisms, however:

- ${variable/pattern/subst}
- ${!variable_variable}

Speaking of: using 'echo' for shell scripting is problematic, because
while bash, busybox's sh, mksh, pdksh and zsh don't interpret escape
sequences (\n, \0oo, ...) by default when using echo and invoked as
/bin/sh, dash and ash do. (Note that e.g. dash ist default on Debian,
so it's not like this is something theoretical.) Also, when invoked as
their proper name (not as /bin/sh), only bash and busybox's shell do
not interpret escape sequences by default with echo. (In short: it's a
mess.)

POSIX itself is ambivalent:

http://pubs.opengroup.org/onlinepubs/009695399/utilities/echo.html
| or if any of the operands contain a backslash ( '\' ) character, the
| results are implementation-defined.

But it does recommend the behavior that ash and dash currently show
and NOT bash's behavior:

| The following character sequences shall be recognized on
| XSI-conformant systems within any of the arguments:
| [ list of escape sequences ]

The only portable way (not only to other UNIX systems, but also to
Linux systems with other shells) of printing things without
interpreting escape sequences is to use printf:

printf '%s\n' "$variable"

This is the same as ALL POSIX-compliant shells.

See also:
http://unix.stackexchange.com/questions/65803/why-is-printf-better-than-echo

Christian
Daniel Mack
2015-05-30 10:42:57 UTC
Permalink
Post by Christian Seiler
Post by Daniel Mack
Post by Mike Gilbert
Post by Daniel Mack
Make sure the variable set via --with-rootprefix= does not contain a
trailing slash, so man pages can use entities like "&rootprefix;/lib"
without ending up having double slashes.
---
configure.ac | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/configure.ac b/configure.ac
index 92654a6..55b73de 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1396,7 +1396,8 @@ AC_ARG_WITH([zshcompletiondir],
AC_ARG_WITH([rootprefix],
AS_HELP_STRING([--with-rootprefix=DIR], [rootfs directory prefix for config files and kernel modules]),
- [], [with_rootprefix=${ac_default_prefix}])
+ [with_rootprefix=`echo ${withval} | sed -e s,/*$,,`],
+ [with_rootprefix=${ac_default_prefix}])
Why do you pipe it through sed when a simple shell parameter expansion would do?
with_rootprefix=${withval%/}
Isn't that's a bash'ism which we try to avoid at other places? FWIW, we
use sed to strip off trailing dashes from $host for EFI_ARCH. Also, that
one only replaces one trailing slash, not all of them.
http://pubs.opengroup.org/onlinepubs/009695399/utilities/xcu_chap02.html#tag_02_06_02
V="aXbXc"
printf '%s\n' "${V#*X}"
printf '%s\n' "${V##*X}"
printf '%s\n' "${V%X*}"
printf '%s\n' "${V%%X*}"
When using either one of bash, dash, ash, busybox's shell, mksh, pdksh
Interesting. I always looked up those sequences in the 'Advanced
Bash-Scripting Guide', so I considered them special to bash. Thanks for
the explanation.
Post by Christian Seiler
Speaking of: using 'echo' for shell scripting is problematic, because
while bash, busybox's sh, mksh, pdksh and zsh don't interpret escape
sequences (\n, \0oo, ...) by default when using echo and invoked as
/bin/sh, dash and ash do. (Note that e.g. dash ist default on Debian,
so it's not like this is something theoretical.) Also, when invoked as
their proper name (not as /bin/sh), only bash and busybox's shell do
not interpret escape sequences by default with echo. (In short: it's a
mess.)
It's a mess indeed. Now we only need a POSIX compliant way to strip
_all_ trailing dashes from a string, then we can get rid of that one
occurrence of 'sed' in configure.ac :)


Thanks,
Daniel
Christian Seiler
2015-05-30 11:13:23 UTC
Permalink
Post by Daniel Mack
Post by Christian Seiler
Speaking of: using 'echo' for shell scripting is problematic, because
while bash, busybox's sh, mksh, pdksh and zsh don't interpret escape
sequences (\n, \0oo, ...) by default when using echo and invoked as
/bin/sh, dash and ash do. (Note that e.g. dash ist default on Debian,
so it's not like this is something theoretical.) Also, when invoked as
their proper name (not as /bin/sh), only bash and busybox's shell do
not interpret escape sequences by default with echo. (In short: it's a
mess.)
It's a mess indeed. Now we only need a POSIX compliant way to strip
_all_ trailing dashes from a string, then we can get rid of that one
occurrence of 'sed' in configure.ac :)
Define once:

# (local variables in functions are a bashism, don't use them, but
# name global variable in such a way that it won't clash with
# anything else)
strip_trailing_slashes()
{
_strip_trailing_slashes_value="$1"
while [[ "${_strip_trailing_slashes_value}" != "${_strip_trailing_slashes_value%/}" ]] ; do
_strip_trailing_slashes_value="${_strip_trailing_slashes_value%/}"
done
printf '%s\n' "${_strip_trailing_slashes_value}"
}

Later:

VAR=$(strip_trailing_slashes "$VAR")

(Or, alternatively, repeat the loop each time, you're using M4
anyway, so you could AC_DEFUN the whole thing.)

It's up to you to decide what you find more appealing.

Christian
Martin Pitt
2015-06-02 09:25:05 UTC
Permalink
Hello Daniel,
Post by Daniel Mack
Could you try the attached patch?
I had to introduce a new entity in custom-entites.ent, because with
"--with-rootprefix=/", "&rootprefix;/lib" resolves to "//lib", and with
the default behaviour of configure, "&rootprefix;lib" becomes "/usrlib".
That is solved with a subsitiution in Makefile.am now, which cleans up
all double slashes in custom-entites.ent.
FTR, this works fine here, using --with-rootprefix= (to avoid the
extra slashes). This spawned a long thread and multiple followup
patches, and TBH I lost track which patches got proposed and which are
superseded; but this one looks good to me. Thank you!

Martin
--
Martin Pitt | http://www.piware.de
Ubuntu Developer (www.ubuntu.com) | Debian Developer (www.debian.org)
Daniel Mack
2015-06-02 10:04:38 UTC
Permalink
Post by Martin Pitt
Post by Daniel Mack
Could you try the attached patch?
I had to introduce a new entity in custom-entites.ent, because with
"--with-rootprefix=/", "&rootprefix;/lib" resolves to "//lib", and with
the default behaviour of configure, "&rootprefix;lib" becomes "/usrlib".
That is solved with a subsitiution in Makefile.am now, which cleans up
all double slashes in custom-entites.ent.
FTR, this works fine here, using --with-rootprefix= (to avoid the
extra slashes). This spawned a long thread and multiple followup
patches, and TBH I lost track which patches got proposed and which are
superseded; but this one looks good to me. Thank you!
Michael came up with a nicer approach to sanitize all path arguments to
configure and strip trailing slashes before the Makefile variables are
substituted. I think we should go for that. I'll collect patches and
prepare a pull request later.


Thanks,
Daniel
Filipe Brandenburger
2015-06-02 13:50:30 UTC
Permalink
Hi Daniel,
Post by Daniel Mack
Post by Martin Pitt
FTR, this works fine here, using --with-rootprefix= (to avoid the
extra slashes). This spawned a long thread and multiple followup
patches, and TBH I lost track which patches got proposed and which are
superseded; but this one looks good to me. Thank you!
Michael came up with a nicer approach to sanitize all path arguments to
configure and strip trailing slashes before the Makefile variables are
substituted. I think we should go for that. I'll collect patches and
prepare a pull request later.
This is the one patch which does path AX_NORMALIZE_PATH that we're
still missing:
https://github.com/systemd/systemd/commit/d10b3a45b17403ce8a52680703b03888ebee0769

I resent Michael's original patch but including the import of the
latest ax_normalize_path.m4 from autoconf-archive.

I also tested it with a few combinations including --with-rootpath=/
and it worked fine.

I could create a PR in systemd-devs GitHub if you'd like, otherwise
feel free to just push it straight upstream if you prefer.

Cheers,
Filipe
Daniel Mack
2015-06-02 14:24:52 UTC
Permalink
Post by Filipe Brandenburger
Hi Daniel,
Post by Daniel Mack
Post by Martin Pitt
FTR, this works fine here, using --with-rootprefix= (to avoid the
extra slashes). This spawned a long thread and multiple followup
patches, and TBH I lost track which patches got proposed and which are
superseded; but this one looks good to me. Thank you!
Michael came up with a nicer approach to sanitize all path arguments to
configure and strip trailing slashes before the Makefile variables are
substituted. I think we should go for that. I'll collect patches and
prepare a pull request later.
This is the one patch which does path AX_NORMALIZE_PATH that we're
https://github.com/systemd/systemd/commit/d10b3a45b17403ce8a52680703b03888ebee0769
I resent Michael's original patch but including the import of the
latest ax_normalize_path.m4 from autoconf-archive.
I also tested it with a few combinations including --with-rootpath=/
and it worked fine.
I could create a PR in systemd-devs GitHub if you'd like, otherwise
feel free to just push it straight upstream if you prefer.
Nope, let's try to get used to the new workflow. Just create the PR :)


Thanks,
Daniel
Filipe Brandenburger
2015-06-02 15:01:02 UTC
Permalink
Post by Daniel Mack
Post by Filipe Brandenburger
I could create a PR in systemd-devs GitHub if you'd like, otherwise
feel free to just push it straight upstream if you prefer.
Nope, let's try to get used to the new workflow. Just create the PR :)
Good call... we were actually missing two patches, the second one was
yours replacing the /usr/lib cases with &rootprefix...

GitHub PR is here:
https://github.com/systemd/systemd/pull/39

Michael Biebl, I wanted to cc you on the GitHub PR but didn't find you
there, feel free to cc yourself by following that URL. In particular,
take a look at your commit which I adapted to include the .m4 file
from autoconf-archive.

Cheers,
Filipe

Lennart Poettering
2015-05-29 09:29:13 UTC
Permalink
Post by Filipe Brandenburger
Post by Michael Biebl
Post by Martin Pitt
\o/ Many thanks Filipe, that's great! Biggest patch gone :)
A huge thanks from me as well to everyone involved!
Lennart: Thanks for applying it.
Martin and Michael: You're welcome, glad to help!
We're actually still missing a small part of it (A sentence like
"Files in /etc have the highest priority, files in /run take
precedence over files with the same name in */usr/lib*." in files like
hwdb.xml, the last /usr/lib won't get fixed) but it requires new
variables. I'm leaning towards introducing a rootsysconfdir=/etc and
rootlibdir=$(rootprefix)/lib (we already have a rootbindir) so I'll
follow up with a patch doing that.
In these cases we actually end up looking in both /usr/lib and /lib
usually (with exceptions). Hence be careful if you want to correct
this in the man pages.

I'd prefer not to document both paths if both are supported
simultaneously, distros and users should be pushed to only consider
one of the two even if we read from both.

Lennart
--
Lennart Poettering, Red Hat
Continue reading on narkive:
Loading...