diff options
author | Tom Gundersen <teg@jklm.no> | 2015-06-18 19:47:44 +0200 |
---|---|---|
committer | Sven Eden <yamakuzure@gmx.net> | 2017-03-14 10:03:49 +0100 |
commit | 2f19b8e572ecc317846621d6429a535e49d29917 (patch) | |
tree | 41460566766e173cf81352e4b4db1bdd90567894 /man | |
parent | 6d7ac6a0404acb4908688b78bca6f39f76d54bb4 (diff) |
man: revert dynamic paths for split-usr setups
This did not really work out as we had hoped. Trying to do this upstream
introduced several problems that probably makes it better suited as a
downstream patch after all. At any rate, it is not releaseable in the
current state, so we at least need to revert this before the release.
* by adjusting the path to binaries, but not do the same thing to the
search path we end up with inconsistent man-pages. Adjusting the search
path too would be quite messy, and it is not at all obvious that this is
worth the effort, but at any rate it would have to be done before we
could ship this.
* this means that distributed man-pages does not make sense as they depend
on config options, and for better or worse we are still distributing
man pages, so that is something that definitely needs sorting out before
we could ship with this patch.
* we have long held that split-usr is only minimally supported in order
to boot, and something we hope will eventually go away. So before we start
adding even more magic/effort in order to make this work nicely, we should
probably question if it makes sense at all.
Diffstat (limited to 'man')
-rw-r--r-- | man/libelogind-pkgconfig.xml | 5 | ||||
-rw-r--r-- | man/loginctl.xml | 5 | ||||
-rw-r--r-- | man/logind.conf.xml | 11 | ||||
-rw-r--r-- | man/logind.xml | 7 | ||||
-rw-r--r-- | man/pam_elogind.xml | 5 | ||||
-rw-r--r-- | man/sd-login.xml | 5 | ||||
-rw-r--r-- | man/sd_get_seats.xml | 5 | ||||
-rw-r--r-- | man/sd_login_monitor_new.xml | 5 | ||||
-rw-r--r-- | man/sd_pid_get_session.xml | 5 | ||||
-rw-r--r-- | man/sd_seat_get_active.xml | 5 | ||||
-rw-r--r-- | man/sd_session_is_active.xml | 5 | ||||
-rw-r--r-- | man/sd_uid_get_state.xml | 5 |
12 files changed, 16 insertions, 52 deletions
diff --git a/man/libelogind-pkgconfig.xml b/man/libelogind-pkgconfig.xml index bda91ce50..c940b15b3 100644 --- a/man/libelogind-pkgconfig.xml +++ b/man/libelogind-pkgconfig.xml @@ -1,9 +1,6 @@ <?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" [ -<!ENTITY % entities SYSTEM "custom-entities.ent" > -%entities; -]> + "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd"> <refsect1> <title>Notes</title> diff --git a/man/loginctl.xml b/man/loginctl.xml index 9fecb7a33..4e09e7a1c 100644 --- a/man/loginctl.xml +++ b/man/loginctl.xml @@ -1,9 +1,6 @@ <?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" [ -<!ENTITY % entities SYSTEM "custom-entities.ent" > -%entities; -]> + "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd"> <!-- This file is part of systemd. diff --git a/man/logind.conf.xml b/man/logind.conf.xml index 4deaadb76..9332e8075 100644 --- a/man/logind.conf.xml +++ b/man/logind.conf.xml @@ -1,9 +1,6 @@ <?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" [ -<!ENTITY % entities SYSTEM "custom-entities.ent" > -%entities; -]> + "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd"> <!-- This file is part of systemd. @@ -51,10 +48,10 @@ </refnamediv> <refsynopsisdiv> - <para><filename>&pkgsysconfdir;/logind.conf</filename></para> - <para><filename>&pkgsysconfdir;/logind.conf.d/*.conf</filename></para> + <para><filename>/etc/systemd/logind.conf</filename></para> + <para><filename>/etc/systemd/logind.conf.d/*.conf</filename></para> <para><filename>/run/systemd/logind.conf.d/*.conf</filename></para> - <para><filename>&rootlibexecdir;/logind.conf.d/*.conf</filename></para> + <para><filename>/usr/lib/systemd/logind.conf.d/*.conf</filename></para> </refsynopsisdiv> <refsect1> diff --git a/man/logind.xml b/man/logind.xml index 1416d884c..5733e42cd 100644 --- a/man/logind.xml +++ b/man/logind.xml @@ -1,9 +1,6 @@ <?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" [ -<!ENTITY % entities SYSTEM "custom-entities.ent" > -%entities; -]> + "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd"> <!-- This file is part of systemd. @@ -53,7 +50,7 @@ <refsynopsisdiv> <para><filename>systemd-logind.service</filename></para> - <para><filename>&rootlibexecdir;/systemd-logind</filename></para> + <para><filename>/usr/lib/systemd/systemd-logind</filename></para> </refsynopsisdiv> <refsect1> diff --git a/man/pam_elogind.xml b/man/pam_elogind.xml index d2f183b76..7c3690aab 100644 --- a/man/pam_elogind.xml +++ b/man/pam_elogind.xml @@ -1,9 +1,6 @@ <?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" [ -<!ENTITY % entities SYSTEM "custom-entities.ent" > -%entities; -]> + "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd"> <!-- This file is part of systemd. diff --git a/man/sd-login.xml b/man/sd-login.xml index d220025b5..06ffc6906 100644 --- a/man/sd-login.xml +++ b/man/sd-login.xml @@ -1,9 +1,6 @@ <?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" [ -<!ENTITY % entities SYSTEM "custom-entities.ent" > -%entities; -]> + "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd"> <!-- This file is part of systemd. diff --git a/man/sd_get_seats.xml b/man/sd_get_seats.xml index 72cf2f9ae..c6b133e66 100644 --- a/man/sd_get_seats.xml +++ b/man/sd_get_seats.xml @@ -1,9 +1,6 @@ <?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" [ -<!ENTITY % entities SYSTEM "custom-entities.ent" > -%entities; -]> + "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd"> <!-- This file is part of systemd. diff --git a/man/sd_login_monitor_new.xml b/man/sd_login_monitor_new.xml index f24d8b3ce..7319c061c 100644 --- a/man/sd_login_monitor_new.xml +++ b/man/sd_login_monitor_new.xml @@ -1,9 +1,6 @@ <?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" [ -<!ENTITY % entities SYSTEM "custom-entities.ent" > -%entities; -]> + "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd"> <!-- This file is part of systemd. diff --git a/man/sd_pid_get_session.xml b/man/sd_pid_get_session.xml index 60bc7ed88..fac072a4c 100644 --- a/man/sd_pid_get_session.xml +++ b/man/sd_pid_get_session.xml @@ -1,9 +1,6 @@ <?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" [ -<!ENTITY % entities SYSTEM "custom-entities.ent" > -%entities; -]> + "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd"> <!-- This file is part of systemd. diff --git a/man/sd_seat_get_active.xml b/man/sd_seat_get_active.xml index 8fda8b3f8..e0002c205 100644 --- a/man/sd_seat_get_active.xml +++ b/man/sd_seat_get_active.xml @@ -1,9 +1,6 @@ <?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" [ -<!ENTITY % entities SYSTEM "custom-entities.ent" > -%entities; -]> + "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd"> <!-- This file is part of systemd. diff --git a/man/sd_session_is_active.xml b/man/sd_session_is_active.xml index 70d201e29..069cbe091 100644 --- a/man/sd_session_is_active.xml +++ b/man/sd_session_is_active.xml @@ -1,9 +1,6 @@ <?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" [ -<!ENTITY % entities SYSTEM "custom-entities.ent" > -%entities; -]> + "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd"> <!-- This file is part of systemd. diff --git a/man/sd_uid_get_state.xml b/man/sd_uid_get_state.xml index fbadb5016..4218f7381 100644 --- a/man/sd_uid_get_state.xml +++ b/man/sd_uid_get_state.xml @@ -1,9 +1,6 @@ <?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" [ -<!ENTITY % entities SYSTEM "custom-entities.ent" > -%entities; -]> + "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd"> <!-- This file is part of systemd. |