mirror of
https://github.com/systemd/systemd-stable.git
synced 2024-12-22 13:33:56 +03:00
Promote systemd-activate to /usr/bin/systemd-socket-activate
It has fairly wide functionality now and the interface has been stable for a while. It it a useful testing tool. The name is changed to better indicate what it does.
This commit is contained in:
Zbigniew Jędrzejewski-Szmek
parent
cf98937cc7
commit
7f6e804332
2
.gitignore
vendored
2
.gitignore
vendored
@ -49,7 +49,6 @@
|
||||
/systemctl
|
||||
/systemd
|
||||
/systemd-ac-power
|
||||
/systemd-activate
|
||||
/systemd-analyze
|
||||
/systemd-ask-password
|
||||
/systemd-backlight
|
||||
@ -109,6 +108,7 @@
|
||||
/systemd-run
|
||||
/systemd-shutdown
|
||||
/systemd-sleep
|
||||
/systemd-socket-activate
|
||||
/systemd-socket-proxyd
|
||||
/systemd-stdio-bridge
|
||||
/systemd-sysctl
|
||||
|
||||
@ -94,7 +94,6 @@ MANPAGES += \
|
||||
man/shutdown.8 \
|
||||
man/sysctl.d.5 \
|
||||
man/systemctl.1 \
|
||||
man/systemd-activate.8 \
|
||||
man/systemd-analyze.1 \
|
||||
man/systemd-ask-password-console.service.8 \
|
||||
man/systemd-ask-password.1 \
|
||||
@ -126,6 +125,7 @@ MANPAGES += \
|
||||
man/systemd-resolve.1 \
|
||||
man/systemd-run.1 \
|
||||
man/systemd-sleep.conf.5 \
|
||||
man/systemd-socket-activate.1 \
|
||||
man/systemd-socket-proxyd.8 \
|
||||
man/systemd-suspend.service.8 \
|
||||
man/systemd-sysctl.service.8 \
|
||||
@ -2574,7 +2574,6 @@ EXTRA_DIST += \
|
||||
man/standard-options.xml \
|
||||
man/sysctl.d.xml \
|
||||
man/systemctl.xml \
|
||||
man/systemd-activate.xml \
|
||||
man/systemd-analyze.xml \
|
||||
man/systemd-ask-password-console.service.xml \
|
||||
man/systemd-ask-password.xml \
|
||||
@ -2628,6 +2627,7 @@ EXTRA_DIST += \
|
||||
man/systemd-rfkill.service.xml \
|
||||
man/systemd-run.xml \
|
||||
man/systemd-sleep.conf.xml \
|
||||
man/systemd-socket-activate.xml \
|
||||
man/systemd-socket-proxyd.xml \
|
||||
man/systemd-suspend.service.xml \
|
||||
man/systemd-sysctl.service.xml \
|
||||
|
||||
@ -3875,13 +3875,13 @@ tests += \
|
||||
|
||||
# ------------------------------------------------------------------------------
|
||||
|
||||
rootlibexec_PROGRAMS += \
|
||||
systemd-activate
|
||||
bin_PROGRAMS += \
|
||||
systemd-socket-activate
|
||||
|
||||
systemd_activate_SOURCES = \
|
||||
systemd_socket_activate_SOURCES = \
|
||||
src/activate/activate.c
|
||||
|
||||
systemd_activate_LDADD = \
|
||||
systemd_socket_activate_LDADD = \
|
||||
libshared.la
|
||||
|
||||
# ------------------------------------------------------------------------------
|
||||
|
||||
6
NEWS
6
NEWS
@ -1,5 +1,11 @@
|
||||
systemd System and Service Manager
|
||||
|
||||
CHANGES WITH 230 in spe:
|
||||
|
||||
* Testing tool /usr/lib/systemd/systemd-activate is renamed to
|
||||
systemd-socket-activate and installed into /usr/bin. It is now fully
|
||||
supported.
|
||||
|
||||
CHANGES WITH 229:
|
||||
|
||||
* The systemd-resolved DNS resolver service has gained a substantial
|
||||
|
||||
@ -21,11 +21,11 @@
|
||||
along with systemd; If not, see <http://www.gnu.org/licenses/>.
|
||||
-->
|
||||
|
||||
<refentry id="systemd-activate"
|
||||
<refentry id="systemd-socket-activate"
|
||||
xmlns:xi="http://www.w3.org/2001/XInclude">
|
||||
|
||||
<refentryinfo>
|
||||
<title>systemd-activate</title>
|
||||
<title>systemd-socket-activate</title>
|
||||
<productname>systemd</productname>
|
||||
|
||||
<authorgroup>
|
||||
@ -39,18 +39,18 @@
|
||||
</refentryinfo>
|
||||
|
||||
<refmeta>
|
||||
<refentrytitle>systemd-activate</refentrytitle>
|
||||
<manvolnum>8</manvolnum>
|
||||
<refentrytitle>systemd-socket-activate</refentrytitle>
|
||||
<manvolnum>1</manvolnum>
|
||||
</refmeta>
|
||||
|
||||
<refnamediv>
|
||||
<refname>systemd-activate</refname>
|
||||
<refname>systemd-socket-activate</refname>
|
||||
<refpurpose>Test socket activation of daemons</refpurpose>
|
||||
</refnamediv>
|
||||
|
||||
<refsynopsisdiv>
|
||||
<cmdsynopsis>
|
||||
<command>/usr/lib/systemd/systemd-activate</command>
|
||||
<command>systemd-socket-activate</command>
|
||||
<arg choice="opt" rep="repeat">OPTIONS</arg>
|
||||
<arg choice="plain"><replaceable>daemon</replaceable></arg>
|
||||
<arg choice="opt" rep="repeat">OPTIONS</arg>
|
||||
@ -60,20 +60,20 @@
|
||||
<refsect1>
|
||||
<title>Description</title>
|
||||
|
||||
<para><command>systemd-activate</command> may be used to launch a socket-activated service binary from the command
|
||||
<para><command>systemd-socket-activate</command> may be used to launch a socket-activated service binary from the command
|
||||
line for testing purposes. It may also be used to launch individual instances of the service binary per connection.
|
||||
</para>
|
||||
|
||||
<para>The daemon to launch and its options should be specified
|
||||
after options intended for <command>systemd-activate</command>.
|
||||
after options intended for <command>systemd-socket-activate</command>.
|
||||
</para>
|
||||
|
||||
<para>If the <option>--inetd</option> option is given, the socket file descriptor will be used as the standard
|
||||
input and output of the launched process. Otherwise, standard input and output will be inherited, and sockets will
|
||||
be passed through file descriptors 3 and higher. Sockets passed through <varname>$LISTEN_FDS</varname> to
|
||||
<command>systemd-activate</command> will be passed through to the daemon, in the original positions. Other sockets
|
||||
<command>systemd-socket-activate</command> will be passed through to the daemon, in the original positions. Other sockets
|
||||
specified with <option>--listen=</option> will use consecutive descriptors. By default,
|
||||
<command>systemd-activate</command> listens on a stream socket, use <option>--datagram</option> and
|
||||
<command>systemd-socket-activate</command> listens on a stream socket, use <option>--datagram</option> and
|
||||
<option>--seqpacket</option> to listen on datagram or sequential packet sockets instead (see below).
|
||||
</para>
|
||||
</refsect1>
|
||||
@ -131,7 +131,7 @@
|
||||
launched process. If <replaceable>VAR</replaceable> is
|
||||
followed by <literal>=</literal>, assume that it is a
|
||||
variable–value pair. Otherwise, obtain the value from the
|
||||
environment of <command>systemd-activate</command> itself.
|
||||
environment of <command>systemd-socket-activate</command> itself.
|
||||
</para></listitem>
|
||||
</varlistentry>
|
||||
|
||||
@ -182,13 +182,13 @@
|
||||
<example>
|
||||
<title>Run an echo server on port 2000</title>
|
||||
|
||||
<programlisting>$ /usr/lib/systemd/systemd-activate -l 2000 --inetd -a cat</programlisting>
|
||||
<programlisting>$ systemd-socket-activate -l 2000 --inetd -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>$ systemd-socket-activate -l 19531 /usr/lib/systemd/systemd-journal-gatewayd</programlisting>
|
||||
</example>
|
||||
</refsect1>
|
||||
|
||||
Loading…
Reference in New Issue
Block a user