public inbox for
help / color / mirror / Atom feed
Subject: LVM2/libdaemon/server daemon-server.c
Date: Thu, 08 Mar 2012 14:54:00 -0000	[thread overview]
Message-ID: <> (raw)

CVSROOT:	/cvs/lvm2
Module name:	LVM2
Changes by:	2012-03-08 14:54:05

Modified files:
	libdaemon/server: daemon-server.c 

Log message:
	Do not unlink the socket on daemon shutdown if activation is done via systemd.


--- LVM2/libdaemon/server/daemon-server.c	2012/03/01 21:12:40	1.3
+++ LVM2/libdaemon/server/daemon-server.c	2012/03/08 14:54:05	1.4
@@ -508,7 +508,8 @@
 				syslog(LOG_ERR, "Failed to handle a client connection.");
-	if (s.socket_fd >= 0)
+	/* If activated by systemd, do not unlink the socket - systemd takes care of that! */
+	if (!_systemd_activation && s.socket_fd >= 0)
 		if (unlink(s.socket_path))
 			perror("unlink error");

             reply	other threads:[~2012-03-08 14:54 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-03-08 14:54 prajnoha [this message]
2012-03-16 21:30 prajnoha

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \ \ \ \ \

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).