From 7f6e804332f50dbd52afe04f5c3ce9db1072c98b Mon Sep 17 00:00:00 2001 From: =?utf8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Thu, 11 Feb 2016 22:11:33 -0500 Subject: [PATCH] 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. --- .gitignore | 2 +- Makefile-man.am | 4 +-- Makefile.am | 8 +++--- NEWS | 6 +++++ ...tivate.xml => systemd-socket-activate.xml} | 26 +++++++++---------- 5 files changed, 26 insertions(+), 20 deletions(-) rename man/{systemd-activate.xml => systemd-socket-activate.xml} (88%) diff --git a/.gitignore b/.gitignore index cc24233ab88..4ac63a4e284 100644 --- a/.gitignore +++ b/.gitignore @@ -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 diff --git a/Makefile-man.am b/Makefile-man.am index 28b5fb6adb9..f4c9edc42c7 100644 --- a/Makefile-man.am +++ b/Makefile-man.am @@ -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 \ diff --git a/Makefile.am b/Makefile.am index 676d97c7d46..da94b502a37 100644 --- a/Makefile.am +++ b/Makefile.am @@ -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 # ------------------------------------------------------------------------------ diff --git a/NEWS b/NEWS index 265847c7bdb..80e59c53d39 100644 --- a/NEWS +++ b/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 diff --git a/man/systemd-activate.xml b/man/systemd-socket-activate.xml similarity index 88% rename from man/systemd-activate.xml rename to man/systemd-socket-activate.xml index a8e17f2a2a0..5d7f157c72d 100644 --- a/man/systemd-activate.xml +++ b/man/systemd-socket-activate.xml @@ -21,11 +21,11 @@ along with systemd; If not, see . --> - - systemd-activate + systemd-socket-activate systemd @@ -39,18 +39,18 @@ - systemd-activate - 8 + systemd-socket-activate + 1 - systemd-activate + systemd-socket-activate Test socket activation of daemons - /usr/lib/systemd/systemd-activate + systemd-socket-activate OPTIONS daemon OPTIONS @@ -60,20 +60,20 @@ Description - systemd-activate may be used to launch a socket-activated service binary from the command + systemd-socket-activate 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. The daemon to launch and its options should be specified - after options intended for systemd-activate. + after options intended for systemd-socket-activate. If the 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 $LISTEN_FDS to - systemd-activate will be passed through to the daemon, in the original positions. Other sockets + systemd-socket-activate will be passed through to the daemon, in the original positions. Other sockets specified with will use consecutive descriptors. By default, - systemd-activate listens on a stream socket, use and + systemd-socket-activate listens on a stream socket, use and to listen on datagram or sequential packet sockets instead (see below). @@ -131,7 +131,7 @@ launched process. If VAR is followed by =, assume that it is a variable–value pair. Otherwise, obtain the value from the - environment of systemd-activate itself. + environment of systemd-socket-activate itself. @@ -182,13 +182,13 @@ Run an echo server on port 2000 - $ /usr/lib/systemd/systemd-activate -l 2000 --inetd -a cat + $ systemd-socket-activate -l 2000 --inetd -a cat Run a socket-activated instance of <citerefentry><refentrytitle>systemd-journal-gatewayd</refentrytitle><manvolnum>8</manvolnum></citerefentry> - $ /usr/lib/systemd/systemd-activate -l 19531 /usr/lib/systemd/systemd-journal-gatewayd + $ systemd-socket-activate -l 19531 /usr/lib/systemd/systemd-journal-gatewayd -- 2.39.2