[systemd-commits] 3 commits - man/systemd.service.xml man/systemd.socket.xml src/systemctl.c

[Lennart Poettering]

 man/systemd.service.xml |    6 +++++-
 man/systemd.socket.xml  |   11 +++++++++++
 src/systemctl.c         |    5 ++++-
 3 files changed, 20 insertions(+), 2 deletions(-)

New commits:
commit be0396695bae9227ad69fcb61066bd84b3974e16
Author: Lennart Poettering <lennart at poettering.net>
Date:   Wed Feb 9 11:00:17 2011 +0100

    man: clarify a few things

diff --git a/man/systemd.service.xml b/man/systemd.service.xml
index ee4d393..3bd058f 100644
--- a/man/systemd.service.xml
+++ b/man/systemd.service.xml
@@ -223,7 +223,11 @@
                                 daemon. Use of this option is
                                 recommended for services where
                                 <varname>Type=</varname> is set to
-                                <option>forking</option>.</para>
+                                <option>forking</option>. systemd will
+                                read the PID of the main process of
+                                the daemon after start-up of the
+                                service. systemd will not write to the
+                                file configured here.</para>
                                 </listitem>
                         </varlistentry>
 
diff --git a/man/systemd.socket.xml b/man/systemd.socket.xml
index 1aea2f8..3b7581c 100644
--- a/man/systemd.socket.xml
+++ b/man/systemd.socket.xml
@@ -113,6 +113,17 @@
                 <para>Socket units may be used to implement on-demand
                 starting of services, as well as parallelized starting
                 of services.</para>
+
+                <para>Note that the daemon software configured for
+                socket activation with socket units needs to be able
+                to accept sockets from systemd, either via systemd's
+                native socket passing interface (see
+                <citerefentry><refentrytitle>sd_listen_fds</refentrytitle><manvolnum>3</manvolnum></citerefentry>
+                for details) or via the traditional
+                <citerefentry><refentrytitle>inetd</refentrytitle><manvolnum>8</manvolnum></citerefentry>-style
+                socket passing (i.e. sockets passed in via STDIN and
+                STDOUT, using <varname>StandardInput=socket</varname>
+                in the service file).</para>
         </refsect1>
 
         <refsect1>

commit b1c0f1c1366eaec64a804c6011df867ea75ed295
Author: Lennart Poettering <lennart at poettering.net>
Date:   Wed Feb 9 01:11:19 2011 +0100

    systemctl: fix opening params

diff --git a/src/systemctl.c b/src/systemctl.c
index 8527cd1..c09b31d 100644
--- a/src/systemctl.c
+++ b/src/systemctl.c
@@ -180,7 +180,7 @@ static void spawn_ask_password_agent(void) {
                  * call that expects to read EOF we actually do
                  * generate EOF and not delay this indefinitely by
                  * because we keep an unused copy of stdin around. */
-                if ((fd = open("/dev/tty", O_RDWR|O_CLOEXEC|O_NONBLOCK)) < 0) {
+                if ((fd = open("/dev/tty", O_RDWR)) < 0) {
                         log_error("Failed to open /dev/tty: %m");
                         _exit(EXIT_FAILURE);
                 }

commit 715554e7b2171d263274f29407c16215e50f7c0a
Author: Lennart Poettering <lennart at poettering.net>
Date:   Wed Feb 9 01:09:09 2011 +0100

    systemctl: don't start agent for --user

diff --git a/src/systemctl.c b/src/systemctl.c
index 66903ab..8527cd1 100644
--- a/src/systemctl.c
+++ b/src/systemctl.c
@@ -141,6 +141,9 @@ static void spawn_ask_password_agent(void) {
         if (!arg_ask_password)
                 return;
 
+        if (arg_user)
+                return;
+
         parent = getpid();
 
         /* Spawns a temporary TTY agent, making sure it goes away when