From: Peter Krempa <pkrempa@redhat.com>
Date: Mon, 26 Sep 2011 18:06:39 +0000 (+0200)
Subject: daemon: Don't remove pidfiles in init scripts
X-Git-Tag: v0.9.7-rc1~251
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=831977df56118f2750dba402c501ef7ec75d2121;p=thirdparty%2Flibvirt.git

daemon: Don't remove pidfiles in init scripts

Init scripts removed pid file of the daemon. Removing pid files may be
harmful as new api for crash-safe pidfiles is used (introduced by
c8a3a26).
---

diff --git a/daemon/libvirtd.init.in b/daemon/libvirtd.init.in
index 0697a2b692..4e610cb231 100644
--- a/daemon/libvirtd.init.in
+++ b/daemon/libvirtd.init.in
@@ -74,7 +74,6 @@ stop() {
     echo
     if [ $RETVAL -eq 0 ]; then
         rm -f @localstatedir@/lock/subsys/$SERVICE
-        rm -f $PIDFILE
         rm -rf @localstatedir@/cache/libvirt/*
     else
         exit $RETVAL
diff --git a/daemon/libvirtd.upstart b/daemon/libvirtd.upstart
index fd1d951815..f51701aa6c 100644
--- a/daemon/libvirtd.upstart
+++ b/daemon/libvirtd.upstart
@@ -31,9 +31,6 @@ script
         ulimit -c "$DAEMON_COREFILE_LIMIT"
     fi
 
-    # Clean up a pidfile that might be left around
-    rm -f /var/run/libvirtd.pid
-
     mkdir -p /var/cache/libvirt
     rm -rf /var/cache/libvirt/*
 
@@ -41,6 +38,5 @@ script
 end script
 
 post-stop script
-    rm -f $PIDFILE
     rm -rf /var/cache/libvirt/*
 end script