This is the mail archive of the
lvm2-cvs@sourceware.org
mailing list for the LVM2 project.
LVM2/libdaemon/server daemon-server.c
- From: prajnoha at sourceware dot org
- To: lvm-devel at redhat dot com, lvm2-cvs at sourceware dot org
- Date: 8 Mar 2012 14:54:05 -0000
- Subject: LVM2/libdaemon/server daemon-server.c
CVSROOT: /cvs/lvm2
Module name: LVM2
Changes by: prajnoha@sourceware.org 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.
Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/libdaemon/server/daemon-server.c.diff?cvsroot=lvm2&r1=1.3&r2=1.4
--- 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");