diff options
Diffstat (limited to 'man')
48 files changed, 489 insertions, 71 deletions
diff --git a/man/50-xdg-data-dirs.sh b/man/50-xdg-data-dirs.sh new file mode 100755 index 0000000000..073174cb40 --- /dev/null +++ b/man/50-xdg-data-dirs.sh @@ -0,0 +1,12 @@ +#!/bin/bash + +# set the default value +XDG_DATA_DIRS="${XDG_DATA_DIRS:-/usr/local/share/:/usr/share}" + +# add a directory if it exists +if [[ -d /opt/foo/share ]]; then + XDG_DATA_DIRS=/opt/foo/share:${XDG_DATA_DIRS} +fi + +# write our output +echo XDG_DATA_DIRS=$XDG_DATA_DIRS diff --git a/man/90-rearrange-path.py b/man/90-rearrange-path.py new file mode 100755 index 0000000000..c6ff32210f --- /dev/null +++ b/man/90-rearrange-path.py @@ -0,0 +1,40 @@ +#!/usr/bin/python3 + +""" + +Proof-of-concept systemd environment generator that makes sure that bin dirs +are always after matching sbin dirs in the path. +(Changes /sbin:/bin:/foo/bar to /bin:/sbin:/foo/bar.) + +This generator shows how to override the configuration possibly created by +earlier generators. It would be easier to write in bash, but let's have it +in Python just to prove that we can, and to serve as a template for more +interesting generators. + +""" + +import os +import pathlib + +def rearrange_bin_sbin(path): + """Make sure any pair of …/bin, …/sbin directories is in this order + + >>> rearrange_bin_sbin('/bin:/sbin:/usr/sbin:/usr/bin') + '/bin:/sbin:/usr/bin:/usr/sbin' + """ + items = [pathlib.Path(p) for p in path.split(':')] + for i in range(len(items)): + if 'sbin' in items[i].parts: + ind = items[i].parts.index('sbin') + bin = pathlib.Path(*items[i].parts[:ind], 'bin', *items[i].parts[ind+1:]) + if bin in items[i+1:]: + j = i + 1 + items[i+1:].index(bin) + items[i], items[j] = items[j], items[i] + return ':'.join(p.as_posix() for p in items) + +if __name__ == '__main__': + path = os.environ['PATH'] # This should be always set. + # If it's not, we'll just crash, we is OK too. + new = rearrange_bin_sbin(path) + if new != path: + print('PATH={}'.format(new)) diff --git a/man/bootctl.xml b/man/bootctl.xml index e2575a4751..675e0174e9 100644 --- a/man/bootctl.xml +++ b/man/bootctl.xml @@ -118,8 +118,8 @@ <refsect1> <title>See Also</title> <para> - <ulink url="http://www.freedesktop.org/wiki/Specifications/BootLoaderSpec">Boot loader specification</ulink> - <ulink url="http://www.freedesktop.org/wiki/Software/systemd/BootLoaderInterface">Systemd boot loader interface</ulink> + <ulink url="https://www.freedesktop.org/wiki/Specifications/BootLoaderSpec">Boot loader specification</ulink> + <ulink url="https://www.freedesktop.org/wiki/Software/systemd/BootLoaderInterface">Systemd boot loader interface</ulink> </para> </refsect1> </refentry> diff --git a/man/busctl.xml b/man/busctl.xml index f63d0d5bab..28b36f09d0 100644 --- a/man/busctl.xml +++ b/man/busctl.xml @@ -472,7 +472,7 @@ o "/org/freedesktop/systemd1/job/42684"</programlisting> <para> <citerefentry project='dbus'><refentrytitle>dbus-daemon</refentrytitle><manvolnum>1</manvolnum></citerefentry>, - <ulink url="http://freedesktop.org/wiki/Software/dbus">D-Bus</ulink>, + <ulink url="https://www.freedesktop.org/wiki/Software/dbus">D-Bus</ulink>, <citerefentry><refentrytitle>sd-bus</refentrytitle><manvolnum>3</manvolnum></citerefentry>, <citerefentry><refentrytitle>systemd</refentrytitle><manvolnum>1</manvolnum></citerefentry>, <citerefentry><refentrytitle>machinectl</refentrytitle><manvolnum>1</manvolnum></citerefentry>, diff --git a/man/environment.d.xml b/man/environment.d.xml new file mode 100644 index 0000000000..be7758a2f9 --- /dev/null +++ b/man/environment.d.xml @@ -0,0 +1,122 @@ +<?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"> +<!-- + This file is part of systemd. + + Copyright 2016 Red Hat, Inc. + Copyright 2017 Zbigniew Jędrzejewski-Szmek + + systemd is free software; you can redistribute it and/or modify it + under the terms of the GNU Lesser General Public License as published by + the Free Software Foundation; either version 2.1 of the License, or + (at your option) any later version. + + systemd is distributed in the hope that it will be useful, but + WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public License + along with systemd; If not, see <http://www.gnu.org/licenses/>. +--> +<refentry id="environment.d" xmlns:xi="http://www.w3.org/2001/XInclude"> + + <refentryinfo> + <title>environment.d</title> + <productname>systemd</productname> + + <authorgroup> + <author> + <contrib>Developer</contrib> + <firstname>Ray</firstname> + <surname>Strode</surname> + <email>rstrode@redhat.com</email> + </author> + </authorgroup> + </refentryinfo> + + <refmeta> + <refentrytitle>environment.d</refentrytitle> + <manvolnum>5</manvolnum> + </refmeta> + + <refnamediv> + <refname>environment.d</refname> + <refpurpose>Definition of user session environment</refpurpose> + </refnamediv> + + <refsynopsisdiv> + <para><filename>~/.config/environment.d/*.conf</filename></para> + <para><filename>/etc/environment.d/*.conf</filename></para> + <para><filename>/run/environment.d/*.conf</filename></para> + <para><filename>/usr/lib/environment.d/*.conf</filename></para> + <para><filename>/etc/environment</filename></para> + </refsynopsisdiv> + + <refsect1> + <title>Description</title> + + <para>The <filename>environment.d</filename> directories contain a list of "global" environment + variable assignments for the user environment. + <citerefentry><refentrytitle>systemd-environment-d-generator</refentrytitle><manvolnum>8</manvolnum></citerefentry> + parses them and updates the environment exported by the systemd user instance to the services it + starts.</para> + + <para>It is recommended to use numerical prefixes for file names to simplify ordering.</para> + + <para>For backwards compatibility, a symlink to <filename>/etc/environment</filename> is + installed, so this file is also parsed.</para> + </refsect1> + + <xi:include href="standard-conf.xml" xpointer="confd" /> + + <refsect1> + <title>Configuration Format</title> + + <para>The configuration files contain a list of + <literal><replaceable>KEY</replaceable>=<replaceable>VALUE</replaceable></literal> environment + variable assignments, separated by newlines. The right hand side of these assignments may + reference previously defined environment variables, using the <literal>${OTHER_KEY}</literal> + and <literal>$OTHER_KEY</literal> format. It is also possible to use + + <literal>${<replaceable>FOO</replaceable>:-<replaceable>DEFAULT_VALUE</replaceable>}</literal> + to expand in the same way as <literal>${<replaceable>FOO</replaceable>}</literal> unless the + expansion would be empty, in which case it expands to <replaceable>DEFAULT_VALUE</replaceable>, + and use + <literal>${<replaceable>FOO</replaceable>:+<replaceable>ALTERNATE_VALUE</replaceable>}</literal> + to expand to <replaceable>ALTERNATE_VALUE</replaceable> as long as + <literal>${<replaceable>FOO</replaceable>}</literal> would have expanded to a non-empty value. + No other elements of shell syntax are supported.</para> + + <para>Each<replaceable>KEY</replaceable> must be a valid variable name. Empty lines + and lines beginning with the comment character <literal>#</literal> are ignored.</para> + + <refsect2> + <title>Example</title> + <example> + <title>Setup environment to allow access to a program installed in + <filename noindex='true'>/opt/foo</filename></title> + + <para><filename>/etc/environment.d/60-foo.conf</filename>: + </para> + <programlisting> + FOO_DEBUG=force-software-gl,log-verbose + PATH=/opt/foo/bin:$PATH + LD_LIBRARY_PATH=${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}/opt/foo/lib + XDG_DATA_DIRS=/opt/foo/share:${XDG_DATA_DIRS:-/usr/local/share/:/usr/share/} + </programlisting> + </example> + </refsect2> + </refsect1> + + <refsect1> + <title>See Also</title> + <para> + <citerefentry><refentrytitle>systemd</refentrytitle><manvolnum>1</manvolnum></citerefentry>, + <citerefentry><refentrytitle>systemd-environment-d-generator</refentrytitle><manvolnum>8</manvolnum></citerefentry>, + <citerefentry><refentrytitle>systemd.environment-generator</refentrytitle><manvolnum>7</manvolnum></citerefentry> + </para> + </refsect1> + +</refentry> diff --git a/man/file-hierarchy.xml b/man/file-hierarchy.xml index 538a592f8d..ab52ccfe0c 100644 --- a/man/file-hierarchy.xml +++ b/man/file-hierarchy.xml @@ -502,7 +502,7 @@ url="http://standards.freedesktop.org/basedir-spec/basedir-spec-latest.html">XDG Base Directory Specification</ulink>. Additional locations for high-level user resources are defined by <ulink - url="http://www.freedesktop.org/wiki/Software/xdg-user-dirs/">xdg-user-dirs</ulink>.</para> + url="https://www.freedesktop.org/wiki/Software/xdg-user-dirs/">xdg-user-dirs</ulink>.</para> <variablelist> <varlistentry> diff --git a/man/journalctl.xml b/man/journalctl.xml index eacba048bc..cae5312db2 100644 --- a/man/journalctl.xml +++ b/man/journalctl.xml @@ -318,7 +318,7 @@ <para>serializes the journal into a binary (but mostly text-based) stream suitable for backups and network transfer (see - <ulink url="http://www.freedesktop.org/wiki/Software/systemd/export">Journal Export Format</ulink> + <ulink url="https://www.freedesktop.org/wiki/Software/systemd/export">Journal Export Format</ulink> for more information). To import the binary stream back into native journald format use <citerefentry><refentrytitle>systemd-journal-remote</refentrytitle><manvolnum>8</manvolnum></citerefentry>.</para> @@ -332,7 +332,7 @@ <listitem> <para>formats entries as JSON data structures, one per line (see - <ulink url="http://www.freedesktop.org/wiki/Software/systemd/json">Journal JSON Format</ulink> + <ulink url="https://www.freedesktop.org/wiki/Software/systemd/json">Journal JSON Format</ulink> for more information).</para> </listitem> </varlistentry> @@ -401,7 +401,7 @@ manuals. Note that help texts are not available for all messages, but only for selected ones. For more information on the message catalog, please refer to the - <ulink url="http://www.freedesktop.org/wiki/Software/systemd/catalog">Message Catalog Developer Documentation</ulink>.</para> + <ulink url="https://www.freedesktop.org/wiki/Software/systemd/catalog">Message Catalog Developer Documentation</ulink>.</para> <para>Note: when attaching <command>journalctl</command> output to bug reports, please do <emphasis>not</emphasis> use @@ -677,7 +677,7 @@ a new 128-bit ID suitable for identifying messages. This is intended for usage by developers who need a new identifier for a new message they introduce and want to make - recognizable. This will print the new ID in three different + recognizable. This will print the new ID in four different formats which can be copied into source code or similar. </para></listitem> </varlistentry> diff --git a/man/kernel-install.xml b/man/kernel-install.xml index 99b7970457..94b6b1110d 100644 --- a/man/kernel-install.xml +++ b/man/kernel-install.xml @@ -189,7 +189,7 @@ <para> <citerefentry><refentrytitle>machine-id</refentrytitle><manvolnum>5</manvolnum></citerefentry>, <citerefentry><refentrytitle>os-release</refentrytitle><manvolnum>5</manvolnum></citerefentry>, - <ulink url="http://www.freedesktop.org/wiki/Specifications/BootLoaderSpec">Boot loader specification</ulink> + <ulink url="https://www.freedesktop.org/wiki/Specifications/BootLoaderSpec">Boot loader specification</ulink> </para> </refsect1> diff --git a/man/sd-bus.xml b/man/sd-bus.xml index 66b1c96c15..6439395549 100644 --- a/man/sd-bus.xml +++ b/man/sd-bus.xml @@ -62,7 +62,7 @@ <title>Description</title> <para><filename>sd-bus.h</filename> provides an implementation of a D-Bus IPC client. See - <ulink url="http://www.freedesktop.org/software/dbus/" /> + <ulink url="https://www.freedesktop.org/software/dbus/" /> for more information about D-Bus IPC. </para> diff --git a/man/sd-login.xml b/man/sd-login.xml index 328f71164d..6861fbe257 100644 --- a/man/sd-login.xml +++ b/man/sd-login.xml @@ -67,7 +67,7 @@ local system. </para> <para>See <ulink - url="http://www.freedesktop.org/wiki/Software/systemd/multiseat">Multi-Seat + url="https://www.freedesktop.org/wiki/Software/systemd/multiseat">Multi-Seat on Linux</ulink> for an introduction into multi-seat support on Linux, the background for this set of APIs.</para> diff --git a/man/sd_journal_get_catalog.xml b/man/sd_journal_get_catalog.xml index 35ec46f63e..604deb4e8c 100644 --- a/man/sd_journal_get_catalog.xml +++ b/man/sd_journal_get_catalog.xml @@ -90,7 +90,7 @@ <para>For more information about the journal message catalog please refer to the <ulink - url="http://www.freedesktop.org/wiki/Software/systemd/catalog">Journal + url="https://www.freedesktop.org/wiki/Software/systemd/catalog">Journal Message Catalogs</ulink> documentation page.</para> </refsect1> diff --git a/man/systemctl.xml b/man/systemctl.xml index 25db00e5f6..d0b39d771b 100644 --- a/man/systemctl.xml +++ b/man/systemctl.xml @@ -1181,7 +1181,7 @@ Jan 12 10:46:45 example.com bluetoothd[8900]: gatt-time-server: Input/output err <para>For more information on the preset policy format, see <citerefentry><refentrytitle>systemd.preset</refentrytitle><manvolnum>5</manvolnum></citerefentry>. For more information on the concept of presets, please consult the - <ulink url="http://freedesktop.org/wiki/Software/systemd/Preset">Preset</ulink> + <ulink url="https://www.freedesktop.org/wiki/Software/systemd/Preset">Preset</ulink> document.</para> </listitem> </varlistentry> diff --git a/man/systemd-ask-password-console.service.xml b/man/systemd-ask-password-console.service.xml index 479e5f2e5b..3c1537d942 100644 --- a/man/systemd-ask-password-console.service.xml +++ b/man/systemd-ask-password-console.service.xml @@ -71,7 +71,7 @@ properly notified.</para> <para>See the <ulink - url="http://www.freedesktop.org/wiki/Software/systemd/PasswordAgents"> + url="https://www.freedesktop.org/wiki/Software/systemd/PasswordAgents"> developer documentation</ulink> for more information about the system password logic.</para> diff --git a/man/systemd-ask-password.xml b/man/systemd-ask-password.xml index 8d3355819b..51d8ef5d82 100644 --- a/man/systemd-ask-password.xml +++ b/man/systemd-ask-password.xml @@ -109,7 +109,7 @@ <para>Additional password agents may be implemented according to the <ulink - url="http://www.freedesktop.org/wiki/Software/systemd/PasswordAgents">systemd + url="https://www.freedesktop.org/wiki/Software/systemd/PasswordAgents">systemd Password Agent Specification</ulink>.</para> <para>If a password is queried on a TTY, the user may press TAB to diff --git a/man/systemd-coredump.xml b/man/systemd-coredump.xml index 7243467dc2..2c285bcb22 100644 --- a/man/systemd-coredump.xml +++ b/man/systemd-coredump.xml @@ -91,7 +91,7 @@ <para>It is also possible to invoke <command>systemd-coredump</command> with <option>--backtrace</option> option. In this case, <command>systemd-coredump</command> expects a journal entry in the journal - <ulink url="http://www.freedesktop.org/wiki/Software/systemd/export">Journal Export Format</ulink> + <ulink url="https://www.freedesktop.org/wiki/Software/systemd/export">Journal Export Format</ulink> on standard input. The entry should contain a <varname>MESSAGE=</varname> field and any additional metadata fields the caller deems reasonable. <command>systemd-coredump</command> will append additional metadata fields in the same way it does for core dumps received from the kernel. In diff --git a/man/systemd-cryptsetup@.service.xml b/man/systemd-cryptsetup@.service.xml index fb8b06714d..73bd5b78ab 100644 --- a/man/systemd-cryptsetup@.service.xml +++ b/man/systemd-cryptsetup@.service.xml @@ -61,7 +61,7 @@ <para><filename>systemd-cryptsetup@.service</filename> will ask for hard disk passwords via the <ulink - url="http://www.freedesktop.org/wiki/Software/systemd/PasswordAgents"> + url="https://www.freedesktop.org/wiki/Software/systemd/PasswordAgents"> password agent logic</ulink>, in order to query the user for the password using the right mechanism at boot and during runtime.</para> diff --git a/man/systemd-environment-d-generator.xml b/man/systemd-environment-d-generator.xml new file mode 100644 index 0000000000..cc00a5256d --- /dev/null +++ b/man/systemd-environment-d-generator.xml @@ -0,0 +1,80 @@ +<?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; +]> + +<!-- + This file is part of systemd. + + Copyright 2017 Zbigniew Jędrzejewski-Szmek + + systemd is free software; you can redistribute it and/or modify it + under the terms of the GNU Lesser General Public License as published by + the Free Software Foundation; either version 2.1 of the License, or + (at your option) any later version. + + systemd is distributed in the hope that it will be useful, but + WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public License + along with systemd; If not, see <http://www.gnu.org/licenses/>. +--> +<refentry id="systemd-environment-d-generator"> + + <refentryinfo> + <title>systemd-environment-d-generator</title> + <productname>systemd</productname> + + <authorgroup> + <author> + <contrib>Developer</contrib> + <firstname>Zbigniew</firstname> + <surname>Jędrzejewski-Szmek</surname> + <email>zbyszek@in.waw.pl</email> + </author> + </authorgroup> + </refentryinfo> + + <refmeta> + <refentrytitle>systemd-environment-d-generator</refentrytitle> + <manvolnum>8</manvolnum> + </refmeta> + + <refnamediv> + <refname>systemd-environment-d-generator</refname> + <refname>30-systemd-environment-d-generator</refname> + <refpurpose>Load variables specified by <filename>environment.d</filename> + </refpurpose> + </refnamediv> + + <refsynopsisdiv> + <para><filename>&userenvgeneratordir;/30-systemd-environment-d-generator</filename></para> + </refsynopsisdiv> + + <refsect1> + <title>Description</title> + + <para><filename>systemd-environment-d-generator</filename> is a + <citerefentry><refentrytitle>systemd.environment-generator</refentrytitle><manvolnum>7</manvolnum></citerefentry> + that reads environment configuration specified by + <citerefentry><refentrytitle>environment.d</refentrytitle><manvolnum>7</manvolnum></citerefentry> + configuration files and passes it to the + <citerefentry><refentrytitle>systemd</refentrytitle><manvolnum>1</manvolnum></citerefentry> + user manager instance.</para> + </refsect1> + + <refsect1> + <title>See Also</title> + <para> + <citerefentry><refentrytitle>systemd</refentrytitle><manvolnum>1</manvolnum></citerefentry>, + <citerefentry><refentrytitle>systemctl</refentrytitle><manvolnum>1</manvolnum></citerefentry>, + <citerefentry><refentrytitle>systemd.environment-generator</refentrytitle><manvolnum>7</manvolnum></citerefentry>, + <citerefentry><refentrytitle>systemd.generator</refentrytitle><manvolnum>7</manvolnum></citerefentry> + </para> + </refsect1> + +</refentry> diff --git a/man/systemd-getty-generator.xml b/man/systemd-getty-generator.xml index 338925964d..8bff3bb7f4 100644 --- a/man/systemd-getty-generator.xml +++ b/man/systemd-getty-generator.xml @@ -64,7 +64,7 @@ <filename>container-getty@.service</filename> instances for additional container pseudo TTYs as requested by the container manager (see <ulink - url="http://www.freedesktop.org/wiki/Software/systemd/ContainerInterface/"><filename>Container + url="https://www.freedesktop.org/wiki/Software/systemd/ContainerInterface/"><filename>Container Interface</filename></ulink>). This should ensure that the user is shown a login prompt at the right place, regardless of which environment the system is started in. For example, it is diff --git a/man/systemd-gpt-auto-generator.xml b/man/systemd-gpt-auto-generator.xml index 3af423b553..eb7a2c4c28 100644 --- a/man/systemd-gpt-auto-generator.xml +++ b/man/systemd-gpt-auto-generator.xml @@ -62,7 +62,7 @@ partitions and creates mount and swap units for them, based on the partition type GUIDs of GUID partition tables (GPT). It implements the <ulink - url="http://www.freedesktop.org/wiki/Specifications/DiscoverablePartitionsSpec/">Discoverable + url="https://www.freedesktop.org/wiki/Specifications/DiscoverablePartitionsSpec/">Discoverable Partitions Specification</ulink>. Note that this generator has no effect on non-GPT systems, or where the directories under the mount points are already non-empty. Also, on systems where the diff --git a/man/systemd-hostnamed.service.xml b/man/systemd-hostnamed.service.xml index 6990d41b02..17755aa69e 100644 --- a/man/systemd-hostnamed.service.xml +++ b/man/systemd-hostnamed.service.xml @@ -66,7 +66,7 @@ is a command line client to this service.</para> <para>See the <ulink - url="http://www.freedesktop.org/wiki/Software/systemd/hostnamed"> + url="https://www.freedesktop.org/wiki/Software/systemd/hostnamed"> developer documentation</ulink> for information about the APIs <filename>systemd-hostnamed</filename> provides.</para> </refsect1> diff --git a/man/systemd-importd.service.xml b/man/systemd-importd.service.xml index 8fdced475c..70a618ce46 100644 --- a/man/systemd-importd.service.xml +++ b/man/systemd-importd.service.xml @@ -64,7 +64,7 @@ <command>import-tar</command>, <command>export-raw</command>, and <command>export-tar</command> commands.</para> <para>See the - <ulink url="http://www.freedesktop.org/wiki/Software/systemd/importd"> + <ulink url="https://www.freedesktop.org/wiki/Software/systemd/importd"> importd D-Bus API Documentation</ulink> for information about the APIs <filename>systemd-importd</filename> provides.</para> </refsect1> diff --git a/man/systemd-inhibit.xml b/man/systemd-inhibit.xml index ce169960d8..09b82b82c1 100644 --- a/man/systemd-inhibit.xml +++ b/man/systemd-inhibit.xml @@ -72,7 +72,7 @@ should not be interrupted.</para> <para>For more information see the <ulink - url="http://www.freedesktop.org/wiki/Software/systemd/inhibit">Inhibitor + url="https://www.freedesktop.org/wiki/Software/systemd/inhibit">Inhibitor Lock Developer Documentation</ulink>.</para> </refsect1> diff --git a/man/systemd-journal-gatewayd.service.xml b/man/systemd-journal-gatewayd.service.xml index 22294542f3..3ee344e50b 100644 --- a/man/systemd-journal-gatewayd.service.xml +++ b/man/systemd-journal-gatewayd.service.xml @@ -197,7 +197,7 @@ one per line (like <command>journalctl --output json</command>). See <ulink - url="http://www.freedesktop.org/wiki/Software/systemd/json">Journal + url="https://www.freedesktop.org/wiki/Software/systemd/json">Journal JSON Format</ulink> for more information.</para> </listitem> </varlistentry> @@ -222,7 +222,7 @@ transfer (like <command>journalctl --output export</command>). See <ulink - url="http://www.freedesktop.org/wiki/Software/systemd/export">Journal + url="https://www.freedesktop.org/wiki/Software/systemd/export">Journal Export Format</ulink> for more information.</para> </listitem> </varlistentry> @@ -289,7 +289,7 @@ <title>Examples</title> <para>Retrieve events from this boot from local journal in <ulink - url="http://www.freedesktop.org/wiki/Software/systemd/export">Journal + url="https://www.freedesktop.org/wiki/Software/systemd/export">Journal Export Format</ulink>: <programlisting>curl --silent -H'Accept: application/vnd.fdo.journal' \ 'http://localhost:19531/entries?boot'</programlisting> diff --git a/man/systemd-journal-remote.xml b/man/systemd-journal-remote.xml index ee2d5c2486..d7750e416e 100644 --- a/man/systemd-journal-remote.xml +++ b/man/systemd-journal-remote.xml @@ -64,7 +64,7 @@ <filename>systemd-journal-remote</filename> is a command to receive serialized journal events and store them to the journal. Input streams are in the - <ulink url="http://www.freedesktop.org/wiki/Software/systemd/export"> + <ulink url="https://www.freedesktop.org/wiki/Software/systemd/export"> Journal Export Format </ulink>, i.e. like the output from diff --git a/man/systemd-localed.service.xml b/man/systemd-localed.service.xml index 06aa78c0e4..2a796c9045 100644 --- a/man/systemd-localed.service.xml +++ b/man/systemd-localed.service.xml @@ -68,7 +68,7 @@ is a command line client to this service.</para> <para>See the <ulink - url="http://www.freedesktop.org/wiki/Software/systemd/localed"> + url="https://www.freedesktop.org/wiki/Software/systemd/localed"> developer documentation</ulink> for information about the APIs <filename>systemd-localed</filename> provides.</para> </refsect1> diff --git a/man/systemd-logind.service.xml b/man/systemd-logind.service.xml index 9288f48f07..5433269638 100644 --- a/man/systemd-logind.service.xml +++ b/man/systemd-logind.service.xml @@ -99,17 +99,17 @@ for information about the configuration of this service.</para> <para>See <ulink - url="http://www.freedesktop.org/wiki/Software/systemd/multiseat">Multi-Seat + url="https://www.freedesktop.org/wiki/Software/systemd/multiseat">Multi-Seat on Linux</ulink> for an introduction into basic concepts of logind such as users, sessions and seats.</para> <para>See the <ulink - url="http://www.freedesktop.org/wiki/Software/systemd/logind"> + url="https://www.freedesktop.org/wiki/Software/systemd/logind"> logind D-Bus API Documentation</ulink> for information about the APIs <filename>systemd-logind</filename> provides.</para> <para>For more information on the inhibition logic see the <ulink - url="http://www.freedesktop.org/wiki/Software/systemd/inhibit">Inhibitor + url="https://www.freedesktop.org/wiki/Software/systemd/inhibit">Inhibitor Lock Developer Documentation</ulink>.</para> </refsect1> diff --git a/man/systemd-machine-id-setup.xml b/man/systemd-machine-id-setup.xml index 944e899bd4..714317c945 100644 --- a/man/systemd-machine-id-setup.xml +++ b/man/systemd-machine-id-setup.xml @@ -92,7 +92,7 @@ environment and a UUID is configured for the container, this is used to initialize the machine ID. For details, see the documentation of the <ulink - url="http://www.freedesktop.org/wiki/Software/systemd/ContainerInterface">Container + url="https://www.freedesktop.org/wiki/Software/systemd/ContainerInterface">Container Interface</ulink>.</para></listitem> <listitem><para>Otherwise, a new ID is randomly diff --git a/man/systemd-machined.service.xml b/man/systemd-machined.service.xml index 999aeee1c6..c4f173f79b 100644 --- a/man/systemd-machined.service.xml +++ b/man/systemd-machined.service.xml @@ -71,7 +71,7 @@ names.</para> <para>See the - <ulink url="http://www.freedesktop.org/wiki/Software/systemd/machined"> + <ulink url="https://www.freedesktop.org/wiki/Software/systemd/machined"> machined D-Bus API Documentation</ulink> for information about the APIs <filename>systemd-machined</filename> provides.</para> </refsect1> diff --git a/man/systemd-nspawn.xml b/man/systemd-nspawn.xml index 96f8c3a61f..a7af8c25db 100644 --- a/man/systemd-nspawn.xml +++ b/man/systemd-nspawn.xml @@ -135,7 +135,7 @@ container.</para> <para><command>systemd-nspawn</command> implements the <ulink - url="http://www.freedesktop.org/wiki/Software/systemd/ContainerInterface">Container Interface</ulink> + url="https://www.freedesktop.org/wiki/Software/systemd/ContainerInterface">Container Interface</ulink> specification.</para> <para>While running, containers invoked with <command>systemd-nspawn</command> are registered with the @@ -233,7 +233,7 @@ a server data partition which are mounted to the appropriate places in the container. All these partitions must be identified by the partition types defined by the <ulink - url="http://www.freedesktop.org/wiki/Specifications/DiscoverablePartitionsSpec/">Discoverable + url="https://www.freedesktop.org/wiki/Specifications/DiscoverablePartitionsSpec/">Discoverable Partitions Specification</ulink>.</para></listitem> <listitem><para>No partition table, and a single file system spanning the whole image.</para></listitem> diff --git a/man/systemd-remount-fs.service.xml b/man/systemd-remount-fs.service.xml index 176f2b2d20..6a5f0e6e38 100644 --- a/man/systemd-remount-fs.service.xml +++ b/man/systemd-remount-fs.service.xml @@ -72,7 +72,7 @@ systems.</para> <para>For a longer discussion of kernel API file systems see - <ulink url="http://www.freedesktop.org/wiki/Software/systemd/APIFileSystems">API + <ulink url="https://www.freedesktop.org/wiki/Software/systemd/APIFileSystems">API File Systems</ulink>.</para> </refsect1> diff --git a/man/systemd-resolved.service.xml b/man/systemd-resolved.service.xml index 6465193cc5..f6831848c7 100644 --- a/man/systemd-resolved.service.xml +++ b/man/systemd-resolved.service.xml @@ -62,7 +62,7 @@ <itemizedlist> <listitem><para>The native, fully-featured API <command>systemd-resolved</command> exposes on the bus. See the - <ulink url="http://www.freedesktop.org/wiki/Software/systemd/resolved">API Documentation</ulink> for + <ulink url="https://www.freedesktop.org/wiki/Software/systemd/resolved">API Documentation</ulink> for details. Usage of this API is generally recommended to clients as it is asynchronous and fully featured (for example, properly returns DNSSEC validation status and interface scope for addresses as necessary for supporting link-local networking).</para></listitem> @@ -156,7 +156,7 @@ per-interface domains are exclusively routed to the matching interfaces.</para> - <para>See the <ulink url="http://www.freedesktop.org/wiki/Software/systemd/resolved"> resolved D-Bus API + <para>See the <ulink url="https://www.freedesktop.org/wiki/Software/systemd/resolved"> resolved D-Bus API Documentation</ulink> for information about the APIs <filename>systemd-resolved</filename> provides.</para> </refsect1> diff --git a/man/systemd-suspend.service.xml b/man/systemd-suspend.service.xml index c7733f2885..2aa172e990 100644 --- a/man/systemd-suspend.service.xml +++ b/man/systemd-suspend.service.xml @@ -91,7 +91,7 @@ for local use only and should be considered hacks. If applications want to react to system suspend/hibernation and resume, they should rather use the <ulink - url="http://www.freedesktop.org/wiki/Software/systemd/inhibit">Inhibitor + url="https://www.freedesktop.org/wiki/Software/systemd/inhibit">Inhibitor interface</ulink>.</para> <para>Note that diff --git a/man/systemd-timedated.service.xml b/man/systemd-timedated.service.xml index e44163aefb..fee860204d 100644 --- a/man/systemd-timedated.service.xml +++ b/man/systemd-timedated.service.xml @@ -67,7 +67,7 @@ is a command line client to this service.</para> <para>See the <ulink - url="http://www.freedesktop.org/wiki/Software/systemd/timedated"> + url="https://www.freedesktop.org/wiki/Software/systemd/timedated"> developer documentation</ulink> for information about the APIs <filename>systemd-timedated</filename> provides.</para> </refsect1> diff --git a/man/systemd-tty-ask-password-agent.xml b/man/systemd-tty-ask-password-agent.xml index 2e4b31be07..2c114f4631 100644 --- a/man/systemd-tty-ask-password-agent.xml +++ b/man/systemd-tty-ask-password-agent.xml @@ -66,7 +66,7 @@ runtime.</para> <para><command>systemd-tty-ask-password-agent</command> implements - the <ulink url="http://www.freedesktop.org/wiki/Software/systemd/PasswordAgents">Password + the <ulink url="https://www.freedesktop.org/wiki/Software/systemd/PasswordAgents">Password Agents Specification</ulink>, and is one of many possible response agents which answer to queries formulated with <citerefentry><refentrytitle>systemd-ask-password</refentrytitle><manvolnum>1</manvolnum></citerefentry>. diff --git a/man/systemd.environment-generator.xml b/man/systemd.environment-generator.xml new file mode 100644 index 0000000000..fedbd60175 --- /dev/null +++ b/man/systemd.environment-generator.xml @@ -0,0 +1,160 @@ +<?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; +]> + +<!-- + This file is part of systemd. + + Copyright 2017 Zbigniew Jędrzejewski-Szmek + + systemd is free software; you can redistribute it and/or modify it + under the terms of the GNU Lesser General Public License as published by + the Free Software Foundation; either version 2.1 of the License, or + (at your option) any later version. + + systemd is distributed in the hope that it will be useful, but + WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public License + along with systemd; If not, see <http://www.gnu.org/licenses/>. +--> + +<refentry id="systemd.environment-generator" xmlns:xi="http://www.w3.org/2001/XInclude"> + <refentryinfo> + <title>systemd.environment-generator</title> + <productname>systemd</productname> + + <authorgroup> + <author> + <contrib>Developer</contrib> + <firstname>Zbigniew</firstname> + <surname>Jędrzejewski-Szmek</surname> + <email>zbyszek@in.waw.pl</email> + </author> + </authorgroup> + </refentryinfo> + + <refmeta> + <refentrytitle>systemd.environment-generator</refentrytitle> + <manvolnum>7</manvolnum> + </refmeta> + + <refnamediv> + <refname>systemd.environment-generator</refname> + <refpurpose>Systemd environment file generators</refpurpose> + </refnamediv> + + <refsynopsisdiv> + <cmdsynopsis> + <command>&systemenvgeneratordir;/some-generator</command> + </cmdsynopsis> + <cmdsynopsis> + <command>&userenvgeneratordir;/some-generator</command> + </cmdsynopsis> + + <para> + <literallayout><filename>/run/systemd/system-environment-generators/*</filename> +<filename>/etc/systemd/system-environment-generators/*</filename> +<filename>/usr/local/lib/systemd/system-environment-generators/*</filename> +<filename>&systemenvgeneratordir;/*</filename></literallayout> + </para> + + <para> + <literallayout><filename>/run/systemd/user-environment-generators/*</filename> +<filename>/etc/systemd/user-environment-generators/*</filename> +<filename>/usr/local/lib/systemd/user-environment-generators/*</filename> +<filename>&userenvgeneratordir;/*</filename></literallayout> + </para> + </refsynopsisdiv> + + <refsect1> + <title>Description</title> + <para>Generators are small executables that live in + <filename>&systemenvgeneratordir;/</filename> and other directories listed above. + <citerefentry><refentrytitle>systemd</refentrytitle><manvolnum>1</manvolnum></citerefentry> will + execute those binaries very early at the startup of each manager and at configuration + reload time, before running the generators described in + <citerefentry><refentrytitle>systemd.generator</refentrytitle><manvolnum>7</manvolnum></citerefentry> + and before starting any units. Environment generators can override the environment that the + manager exports to services and other processes.</para> + + <para>Generators are loaded from a set of paths determined during compilation, as listed + above. System and user environment generators are loaded from directories with names ending in + <filename>system-environment-generators/</filename> and + <filename>user-environment-generators/</filename>, respectively. Generators found in directories + listed earlier override the ones with the same name in directories lower in the list. A symlink + to <filename>/dev/null</filename> or an empty file can be used to mask a generator, thereby + preventing it from running. Please note that the order of the two directories with the highest + priority is reversed with respect to the unit load path, and generators in + <filename>/run</filename> overwrite those in <filename>/etc</filename>.</para> + + <para>After installing new generators or updating the configuration, <command>systemctl + daemon-reload</command> may be executed. This will re-run all generators, updating environment + configuration. It will be used for any services that are started subsequently.</para> + + <para>Environment file generators are executed similarly to unit file generators described + in + <citerefentry><refentrytitle>systemd.generator</refentrytitle><manvolnum>7</manvolnum></citerefentry>, + with the following differences:</para> + + <itemizedlist> + <listitem> + <para>Generators are executed sequentially in the alphanumerical order of the final + component of their name. The output of each generator output is immediately parsed and used + to update the environment for generators that run after that. Thus, later generators can use + and/or modify the output of earlier generators.</para> + </listitem> + + <listitem> + <para>Generators are run by every manager instance, their output can be different for each + user.</para> + </listitem> + </itemizedlist> + + <para>It is recommended to use numerical prefixes for generator names to simplify ordering.</para> + </refsect1> + + <refsect1> + <title>Examples</title> + + <example> + <title>A simple generator that extends an environment variable if a directory exists in the file system</title> + + <programlisting># 50-xdg-data-dirs.sh + +<xi:include href="50-xdg-data-dirs.sh" parse="text" /></programlisting> + </example> + + <example> + <title>A more complicated generator which reads existing configuration and mutates one variable</title> + + <programlisting># 90-rearrange-path.py + +<xi:include href="90-rearrange-path.py" parse="text" /></programlisting> + </example> + + <example> + <title>Debugging a generator</title> + + <programlisting>SYSTEMD_LOG_LEVEL=debug VAR_A=something VAR_B="something else" \ +&systemenvgeneratordir;/path-to-generator +</programlisting> + </example> + </refsect1> + + <refsect1> + <title>See also</title> + + <para> + <citerefentry><refentrytitle>systemd-environment-d-generator</refentrytitle><manvolnum>8</manvolnum></citerefentry>, + <citerefentry><refentrytitle>systemd.generator</refentrytitle><manvolnum>7</manvolnum></citerefentry>, + <citerefentry><refentrytitle>systemd</refentrytitle><manvolnum>1</manvolnum></citerefentry>, + <citerefentry><refentrytitle>systemctl</refentrytitle><manvolnum>1</manvolnum></citerefentry> + </para> + </refsect1> +</refentry> diff --git a/man/systemd.exec.xml b/man/systemd.exec.xml index 16f0f07db7..5d4986b6bf 100644 --- a/man/systemd.exec.xml +++ b/man/systemd.exec.xml @@ -142,7 +142,7 @@ file instead of a directory. The device node or file system image file needs to contain a file system without a partition table, or a file system within an MBR/MS-DOS or GPT partition table with only a single Linux-compatible partition, or a set of file systems within a GPT partition table that follows the <ulink - url="http://www.freedesktop.org/wiki/Specifications/DiscoverablePartitionsSpec/">Discoverable Partitions + url="https://www.freedesktop.org/wiki/Specifications/DiscoverablePartitionsSpec/">Discoverable Partitions Specification</ulink>.</para></listitem> </varlistentry> @@ -1151,16 +1151,18 @@ <filename>/proc/sys</filename>, <filename>/sys</filename>, <filename>/proc/sysrq-trigger</filename>, <filename>/proc/latency_stats</filename>, <filename>/proc/acpi</filename>, <filename>/proc/timer_stats</filename>, <filename>/proc/fs</filename> and <filename>/proc/irq</filename> will - be made read-only to all processes of the unit. Usually, tunable kernel variables should only be written at - boot-time, with the <citerefentry><refentrytitle>sysctl.d</refentrytitle><manvolnum>5</manvolnum></citerefentry> - mechanism. Almost no services need to write to these at runtime; it is hence recommended to turn this on for - most services. For this setting the same restrictions regarding mount propagation and privileges apply as for - <varname>ReadOnlyPaths=</varname> and related calls, see above. Defaults to off. - If turned on and if running in user mode, or in system mode, but without the <constant>CAP_SYS_ADMIN</constant> - capability (e.g. setting <varname>User=</varname>), <varname>NoNewPrivileges=yes</varname> - is implied. Note that this option does not prevent kernel tuning through IPC interfaces - and external programs. However <varname>InaccessiblePaths=</varname> can be used to - make some IPC file system objects inaccessible.</para></listitem> + be made read-only to all processes of the unit. Usually, tunable kernel variables should be initialized only at + boot-time, for example with the + <citerefentry><refentrytitle>sysctl.d</refentrytitle><manvolnum>5</manvolnum></citerefentry> mechanism. Few + services need to write to these at runtime; it is hence recommended to turn this on for most services. For this + setting the same restrictions regarding mount propagation and privileges apply as for + <varname>ReadOnlyPaths=</varname> and related calls, see above. Defaults to off. If turned on and if running + in user mode, or in system mode, but without the <constant>CAP_SYS_ADMIN</constant> capability (e.g. services + for which <varname>User=</varname> is set), <varname>NoNewPrivileges=yes</varname> is implied. Note that this + option does not prevent indirect changes to kernel tunables effected by IPC calls to other processes. However, + <varname>InaccessiblePaths=</varname> may be used to make relevant IPC file system objects inaccessible. If + <varname>ProtectKernelTunables=</varname> is set, <varname>MountAPIVFS=yes</varname> is + implied.</para></listitem> </varlistentry> <varlistentry> @@ -1196,7 +1198,8 @@ unit. Except for container managers no services should require write access to the control groups hierarchies; it is hence recommended to turn this on for most services. For this setting the same restrictions regarding mount propagation and privileges apply as for <varname>ReadOnlyPaths=</varname> and related calls, see - above. Defaults to off.</para></listitem> + above. Defaults to off. If <varname>ProtectControlGroups=</varname> is set, <varname>MountAPIVFS=yes</varname> is + implied.</para></listitem> </varlistentry> <varlistentry> diff --git a/man/systemd.generator.xml b/man/systemd.generator.xml index b268104c9d..fb0f0c4da8 100644 --- a/man/systemd.generator.xml +++ b/man/systemd.generator.xml @@ -342,7 +342,8 @@ find $dir</programlisting> <citerefentry><refentrytitle>systemd-system-update-generator</refentrytitle><manvolnum>8</manvolnum></citerefentry>, <citerefentry><refentrytitle>systemd-sysv-generator</refentrytitle><manvolnum>8</manvolnum></citerefentry>, <citerefentry><refentrytitle>systemd.unit</refentrytitle><manvolnum>5</manvolnum></citerefentry>, - <citerefentry><refentrytitle>systemctl</refentrytitle><manvolnum>1</manvolnum></citerefentry> + <citerefentry><refentrytitle>systemctl</refentrytitle><manvolnum>1</manvolnum></citerefentry>, + <citerefentry><refentrytitle>systemd.environment-generator</refentrytitle><manvolnum>7</manvolnum></citerefentry> </para> </refsect1> </refentry> diff --git a/man/systemd.journal-fields.xml b/man/systemd.journal-fields.xml index 2b0acee407..747d985aa1 100644 --- a/man/systemd.journal-fields.xml +++ b/man/systemd.journal-fields.xml @@ -467,9 +467,9 @@ <para>During serialization into external formats, such as the <ulink - url="http://www.freedesktop.org/wiki/Software/systemd/export">Journal + url="https://www.freedesktop.org/wiki/Software/systemd/export">Journal Export Format</ulink> or the <ulink - url="http://www.freedesktop.org/wiki/Software/systemd/json">Journal + url="https://www.freedesktop.org/wiki/Software/systemd/json">Journal JSON Format</ulink>, the addresses of journal entries are serialized into fields prefixed with double underscores. Note that these are not proper fields when stored in the journal but for diff --git a/man/systemd.mount.xml b/man/systemd.mount.xml index 598b5772fd..4a404fb424 100644 --- a/man/systemd.mount.xml +++ b/man/systemd.mount.xml @@ -104,7 +104,7 @@ for kernel-to-userspace and userspace-to-userspace interfaces. Some of them may not be changed via mount units, and cannot be disabled. For a longer discussion see <ulink - url="http://www.freedesktop.org/wiki/Software/systemd/APIFileSystems">API + url="https://www.freedesktop.org/wiki/Software/systemd/APIFileSystems">API File Systems</ulink>.</para> </refsect1> diff --git a/man/systemd.offline-updates.xml b/man/systemd.offline-updates.xml index 06690b41f4..b4dce3e92d 100644 --- a/man/systemd.offline-updates.xml +++ b/man/systemd.offline-updates.xml @@ -154,7 +154,7 @@ script exits uncleanly (by non-zero error code, or signal/coredump). If your script succeeds you should trigger the reboot in your own code, for example by invoking logind's <command>Reboot()</command> call or calling <command>systemctl reboot</command>. See - <ulink url="http://www.freedesktop.org/wiki/Software/systemd/logind">logind dbus API</ulink> + <ulink url="https://www.freedesktop.org/wiki/Software/systemd/logind">logind dbus API</ulink> for details.</para> </listitem> @@ -170,7 +170,7 @@ <title>See also</title> <para> - <ulink url="http://www.freedesktop.org/wiki/Software/systemd/SystemUpdates/">Implementing Offline System Updates</ulink>, + <ulink url="https://www.freedesktop.org/wiki/Software/systemd/SystemUpdates/">Implementing Offline System Updates</ulink>, <citerefentry><refentrytitle>systemd</refentrytitle><manvolnum>1</manvolnum></citerefentry>, <citerefentry><refentrytitle>systemd.generator</refentrytitle><manvolnum>7</manvolnum></citerefentry>, <citerefentry><refentrytitle>systemd-system-update-generator</refentrytitle><manvolnum>8</manvolnum></citerefentry>, diff --git a/man/systemd.preset.xml b/man/systemd.preset.xml index d09167baaf..92eb4e8280 100644 --- a/man/systemd.preset.xml +++ b/man/systemd.preset.xml @@ -72,7 +72,7 @@ <para>For more information on the preset logic please have a look at the <ulink - url="http://freedesktop.org/wiki/Software/systemd/Preset">Presets</ulink> + url="https://www.freedesktop.org/wiki/Software/systemd/Preset">Presets</ulink> document.</para> <para>It is not recommended to ship preset files within the diff --git a/man/systemd.resource-control.xml b/man/systemd.resource-control.xml index 02878b28a0..9b1f5dbbab 100644 --- a/man/systemd.resource-control.xml +++ b/man/systemd.resource-control.xml @@ -87,7 +87,7 @@ Those options complement options listed here.</para> <para>See the <ulink - url="http://www.freedesktop.org/wiki/Software/systemd/ControlGroupInterface/">New + url="https://www.freedesktop.org/wiki/Software/systemd/ControlGroupInterface/">New Control Group Interfaces</ulink> for an introduction on how to make use of resource control APIs from programs.</para> </refsect1> diff --git a/man/systemd.scope.xml b/man/systemd.scope.xml index f69b2ef635..36f24d46a1 100644 --- a/man/systemd.scope.xml +++ b/man/systemd.scope.xml @@ -69,7 +69,7 @@ command line.</para> <para>See the <ulink - url="http://www.freedesktop.org/wiki/Software/systemd/ControlGroupInterface/">New + url="https://www.freedesktop.org/wiki/Software/systemd/ControlGroupInterface/">New Control Group Interfaces</ulink> for an introduction on how to make use of scope units from programs.</para> </refsect1> diff --git a/man/systemd.service.xml b/man/systemd.service.xml index 627176750f..52eb2bb424 100644 --- a/man/systemd.service.xml +++ b/man/systemd.service.xml @@ -84,7 +84,7 @@ This is useful for compatibility with SysV. Note that this compatibility is quite comprehensive but not 100%. For details about the incompatibilities, see the <ulink - url="http://www.freedesktop.org/wiki/Software/systemd/Incompatibilities">Incompatibilities + url="https://www.freedesktop.org/wiki/Software/systemd/Incompatibilities">Incompatibilities with SysV</ulink> document.</para> </refsect1> diff --git a/man/systemd.slice.xml b/man/systemd.slice.xml index eee98d99ee..3ff3cc5188 100644 --- a/man/systemd.slice.xml +++ b/man/systemd.slice.xml @@ -97,7 +97,7 @@ </para> <para>See the <ulink - url="http://www.freedesktop.org/wiki/Software/systemd/ControlGroupInterface/">New + url="https://www.freedesktop.org/wiki/Software/systemd/ControlGroupInterface/">New Control Group Interfaces</ulink> for an introduction on how to make use of slice units from programs.</para> </refsect1> diff --git a/man/systemd.special.xml b/man/systemd.special.xml index a81cc3579d..fa3dc1c5d4 100644 --- a/man/systemd.special.xml +++ b/man/systemd.special.xml @@ -399,7 +399,7 @@ is part of the boot of most systems, while <filename>network-online.target</filename> is not, except when at least one unit requires it. Also see <ulink - url="http://www.freedesktop.org/wiki/Software/systemd/NetworkTarget">Running + url="https://www.freedesktop.org/wiki/Software/systemd/NetworkTarget">Running Services After the Network is up</ulink> for more information.</para> @@ -616,7 +616,7 @@ on. All userspace log messages will be made available on this socket. For more information about syslog integration, please consult the <ulink - url="http://www.freedesktop.org/wiki/Software/systemd/syslog">Syslog + url="https://www.freedesktop.org/wiki/Software/systemd/syslog">Syslog Interface</ulink> document.</para> </listitem> </varlistentry> @@ -785,7 +785,7 @@ is shut down. It is hence useful when writing service files that require network access on shutdown, which should order themselves after this target, but not pull it in. Also see - <ulink url="http://www.freedesktop.org/wiki/Software/systemd/NetworkTarget">Running + <ulink url="https://www.freedesktop.org/wiki/Software/systemd/NetworkTarget">Running Services After the Network is up</ulink> for more information. Also see <filename>network-online.target</filename> described diff --git a/man/systemd.unit.xml b/man/systemd.unit.xml index 2208b6a287..44841ac7dd 100644 --- a/man/systemd.unit.xml +++ b/man/systemd.unit.xml @@ -256,7 +256,7 @@ <para>The unit file format is covered by the <ulink - url="http://www.freedesktop.org/wiki/Software/systemd/InterfaceStabilityPromise">Interface + url="https://www.freedesktop.org/wiki/Software/systemd/InterfaceStabilityPromise">Interface Stability Promise</ulink>.</para> </refsect1> diff --git a/man/systemd.xml b/man/systemd.xml index bc1563d5e1..4856dea824 100644 --- a/man/systemd.xml +++ b/man/systemd.xml @@ -453,7 +453,7 @@ <para>Note that some but not all interfaces provided by systemd are covered by the - <ulink url="http://www.freedesktop.org/wiki/Software/systemd/InterfaceStabilityPromise">Interface + <ulink url="https://www.freedesktop.org/wiki/Software/systemd/InterfaceStabilityPromise">Interface Stability Promise</ulink>.</para> <para>Units may be generated dynamically at boot and system @@ -463,8 +463,8 @@ <para>Systems which invoke systemd in a container or initrd environment should implement the - <ulink url="http://www.freedesktop.org/wiki/Software/systemd/ContainerInterface">Container Interface</ulink> or - <ulink url="http://www.freedesktop.org/wiki/Software/systemd/InitrdInterface">initrd Interface</ulink> + <ulink url="https://www.freedesktop.org/wiki/Software/systemd/ContainerInterface">Container Interface</ulink> or + <ulink url="https://www.freedesktop.org/wiki/Software/systemd/InitrdInterface">initrd Interface</ulink> specifications, respectively.</para> </refsect1> @@ -1187,7 +1187,7 @@ <refsect1> <title>See Also</title> <para> - The <ulink url="http://www.freedesktop.org/wiki/Software/systemd/">systemd Homepage</ulink>, + The <ulink url="https://www.freedesktop.org/wiki/Software/systemd/">systemd Homepage</ulink>, <citerefentry><refentrytitle>systemd-system.conf</refentrytitle><manvolnum>5</manvolnum></citerefentry>, <citerefentry project='man-pages'><refentrytitle>locale.conf</refentrytitle><manvolnum>5</manvolnum></citerefentry>, <citerefentry><refentrytitle>systemctl</refentrytitle><manvolnum>1</manvolnum></citerefentry>, |