diff options
| -rw-r--r-- | man/busctl.xml | 1 | ||||
| -rw-r--r-- | man/custom-html.xsl | 2 | ||||
| -rw-r--r-- | man/systemd-bus-proxyd.service.xml | 3 | ||||
| -rw-r--r-- | man/systemd-bus-proxyd.xml | 3 | ||||
| -rw-r--r-- | man/systemd.service.xml | 3 | ||||
| -rw-r--r-- | shell-completion/zsh/_systemd-nspawn | 41 | ||||
| -rw-r--r-- | src/udev/udevd.c | 8 |
7 files changed, 31 insertions, 30 deletions
diff --git a/man/busctl.xml b/man/busctl.xml index 233afa955c..4f0b2a7051 100644 --- a/man/busctl.xml +++ b/man/busctl.xml @@ -471,7 +471,6 @@ 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://code.google.com/p/d-bus/">kdbus</ulink>, <citerefentry><refentrytitle>sd-bus</refentrytitle><manvolnum>3</manvolnum></citerefentry>, <citerefentry><refentrytitle>systemd</refentrytitle><manvolnum>1</manvolnum></citerefentry>, <citerefentry><refentrytitle>systemd-bus-proxyd</refentrytitle><manvolnum>8</manvolnum></citerefentry>, diff --git a/man/custom-html.xsl b/man/custom-html.xsl index 0856c1f29c..b298c216b1 100644 --- a/man/custom-html.xsl +++ b/man/custom-html.xsl @@ -231,7 +231,7 @@ <xsl:text>../python-systemd/index.html</xsl:text> </xsl:attribute> <xsl:text>Python </xsl:text> - </a>ยท + </a> <span style="float:right"> <xsl:text>systemd </xsl:text> diff --git a/man/systemd-bus-proxyd.service.xml b/man/systemd-bus-proxyd.service.xml index 5c0f3e1a7a..02189eea7c 100644 --- a/man/systemd-bus-proxyd.service.xml +++ b/man/systemd-bus-proxyd.service.xml @@ -74,8 +74,7 @@ <para> <citerefentry><refentrytitle>systemd-bus-proxyd</refentrytitle><manvolnum>8</manvolnum></citerefentry>, <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://code.google.com/p/d-bus/">kdbus</ulink> + <ulink url="http://freedesktop.org/wiki/Software/dbus">D-Bus</ulink> </para> </refsect1> </refentry> diff --git a/man/systemd-bus-proxyd.xml b/man/systemd-bus-proxyd.xml index 63652b185b..0923396151 100644 --- a/man/systemd-bus-proxyd.xml +++ b/man/systemd-bus-proxyd.xml @@ -102,8 +102,7 @@ <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://code.google.com/p/d-bus/">kdbus</ulink> + <ulink url="http://freedesktop.org/wiki/Software/dbus">D-Bus</ulink> </para> </refsect1> </refentry> diff --git a/man/systemd.service.xml b/man/systemd.service.xml index 191adcda52..1e949f0c52 100644 --- a/man/systemd.service.xml +++ b/man/systemd.service.xml @@ -243,8 +243,7 @@ <varlistentry> <term><varname>BusPolicy=</varname></term> - <listitem><para>If specified, a custom - <ulink url="https://code.google.com/p/d-bus/">kdbus</ulink> + <listitem><para>If specified, a custom kdbus endpoint will be created and installed as the default bus node for the service. Such a custom endpoint can hold an own set of policy rules that are enforced on top of the bus-wide ones. diff --git a/shell-completion/zsh/_systemd-nspawn b/shell-completion/zsh/_systemd-nspawn index 08f5696acb..3e0f667909 100644 --- a/shell-completion/zsh/_systemd-nspawn +++ b/shell-completion/zsh/_systemd-nspawn @@ -17,32 +17,33 @@ _arguments \ {--directory=,-D+}'[Directory to use as file system root for the namespace container. If omitted the current directory will be used.]:directories:_directories' \ '--template=[Initialize root directory from template directory, if missing.]:template:_directories' \ {--ephemeral,-x}'[Run container with snapshot of root directory, and remove it after exit.]' \ - {--image=,-i+}'[Disk image to mount the root directory for the container from.]' \ - {--boot=,-b+}'[Automatically search for an init binary and invoke it instead of a shell or a user supplied program.]' \ - {--user=,-u+}'[Run the command under specified user, create home directory and cd into it.]' \ - {--machine=,-M+}'[Sets the machine name for this container.]' \ - '--uuid=[Set the specified uuid for the container.]' \ - {--slice=,-S+}'[Make the container part of the specified slice, instead of the default machine.slice.]' \ + {--image=,-i+}'[Disk image to mount the root directory for the container from.]:disk image: _files' \ + {--boot,-b}'[Automatically search for an init binary and invoke it instead of a shell or a user supplied program.]' \ + {--user=,-u+}'[Run the command under specified user, create home directory and cd into it.]:user:_users' \ + {--machine=,-M+}'[Sets the machine name for this container.]: : _message "container name"' \ + '--uuid=[Set the specified uuid for the container.]: : _message "container UUID"' \ + {--slice=,-S+}'[Make the container part of the specified slice, instead of the default machine.slice.]: : _message slice' \ '--private-network[Disconnect networking of the container from the host.]' \ - '--network-interface=[Assign the specified network interface to the container.]' \ - '--network-macvlan=[Create a "macvlan" interface of the specified Ethernet network interface and add it to the container.]' \ - '--network-ipvlan=[Create a ipvlan network interface based on an existing network interface to the container.]' \ + '--network-interface=[Assign the specified network interface to the container.]: : _net_interfaces' \ + '--network-macvlan=[Create a "macvlan" interface of the specified Ethernet network interface and add it to the container.]: : _net_interfaces' \ + '--network-ipvlan=[Create a ipvlan network interface based on an existing network interface to the container.]: : _net_interfaces' \ {--network-veth,-n}'[Create a virtual Ethernet link (veth) between host and container.]' \ - '--network-bridge=[Adds the host side of the Ethernet link created with --network-veth to the specified bridge.]' \ - {--port=,-p+}'[Expose a container IP port on the host.]' \ - {--selinux-context=,-Z+}'[Sets the SELinux security context to be used to label processes in the container.]' \ - {--selinux-apifs-context=,-L+}'[Sets the SELinux security context to be used to label files in the virtual API file systems in the container.]' \ + '--network-bridge=[Adds the host side of the Ethernet link created with --network-veth to the specified bridge.]: : _net_interfaces' \ + {--port=,-p+}'[Expose a container IP port on the host.]: : _message port' \ + {--selinux-context=,-Z+}'[Sets the SELinux security context to be used to label processes in the container.]: : _message "SELinux context"' \ + {--selinux-apifs-context=,-L+}'[Sets the SELinux security context to be used to label files in the virtual API file systems in the container.]: : _message "SELinux context"' \ '--capability=[List one or more additional capabilities to grant the container.]:capabilities:_nspawn-caps' \ '--drop-capability=[Specify one or more additional capabilities to drop for the containerm]:capabilities:_nspawn-caps' \ "--link-journal=[Control whether the container's journal shall be made visible to the host system.]:options:(no host guest auto)" \ '-j[Equivalent to --link-journal=guest.]' \ '--read-only[Mount the root file system read only for the container.]' \ - '--bind=[Bind mount a file or directory from the host into the container.]' \ - '--bind-ro=[Bind mount a file or directory from the host into the container (read-only).]' \ - '--tmpfs=[Mount an empty tmpfs to the specified directory.]' \ - '--setenv=[Specifies an environment variable assignment to pass to the init process in the container, in the format "NAME=VALUE".]' \ + '--bind=[Bind mount a file or directory from the host into the container.]: : _files' \ + '--bind-ro=[Bind mount a file or directory from the host into the container (read-only).]: : _files' \ + '--tmpfs=[Mount an empty tmpfs to the specified directory.]: : _files' \ + '--setenv=[Specifies an environment variable assignment to pass to the init process in the container, in the format "NAME=VALUE".]: : _message "environment variables"' \ '--share-system[Allows the container to share certain system facilities with the host.]' \ - '--register=[Controls whether the container is registered with systemd-machined(8).]' \ + '--register=[Controls whether the container is registered with systemd-machined(8).]:systemd-machined registration:( yes no )' \ '--keep-unit[Instead of creating a transient scope unit to run the container in, simply register the service or scope unit systemd-nspawn has been invoked in with systemd-machined(8).]' \ - '--personality=[Control the architecture ("personality") reported by uname(2) in the container.]' \ - '--volatile=[Run the system in volatile mode.]:volatile:(no yes state)' + '--personality=[Control the architecture ("personality") reported by uname(2) in the container.]:architecture:(x86 x86-64)' \ + '--volatile=[Run the system in volatile mode.]:volatile:(no yes state)' \ + '*:: : _normal' diff --git a/src/udev/udevd.c b/src/udev/udevd.c index c205f1d5ec..ff15664cb4 100644 --- a/src/udev/udevd.c +++ b/src/udev/udevd.c @@ -1672,8 +1672,12 @@ int main(int argc, char *argv[]) { we only do this on systemd systems, and only if we are directly spawned by PID1. otherwise we are not guaranteed to have a dedicated cgroup */ r = cg_pid_get_path(SYSTEMD_CGROUP_CONTROLLER, 0, &cgroup); - if (r < 0) - log_warning_errno(r, "failed to get cgroup: %m"); + if (r < 0) { + if (r == -ENOENT) + log_debug_errno(r, "did not find dedicated cgroup: %m"); + else + log_warning_errno(r, "failed to get cgroup: %m"); + } } r = listen_fds(&fd_ctrl, &fd_uevent); |