[libvirt] [PATCH] Revert "virtlockd: treat SIGHUP like SIGUSR1"

This reverts commit 8355d42dd3df514c8584e0e5082b945b79671fc5. After some discussion upstream [1] this patch turns out to be spurious. It better gets reverted prior to a release. 1: https://www.redhat.com/archives/libvir-list/2013-December/msg00563.html Signed-off-by: Michal Privoznik <mprivozn@redhat.com> --- src/locking/lock_daemon.c | 2 -- src/locking/virtlockd.pod.in | 6 +++--- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/src/locking/lock_daemon.c b/src/locking/lock_daemon.c index ae09ef8..a6be43c 100644 --- a/src/locking/lock_daemon.c +++ b/src/locking/lock_daemon.c @@ -592,8 +592,6 @@ virLockDaemonSetupSignals(virNetServerPtr srv) return -1; if (virNetServerAddSignalHandler(srv, SIGUSR1, virLockDaemonExecRestartHandler, NULL) < 0) return -1; - if (virNetServerAddSignalHandler(srv, SIGHUP, virLockDaemonExecRestartHandler, NULL) < 0) - return -1; return 0; } diff --git a/src/locking/virtlockd.pod.in b/src/locking/virtlockd.pod.in index 022d67f..99612aa 100644 --- a/src/locking/virtlockd.pod.in +++ b/src/locking/virtlockd.pod.in @@ -54,9 +54,9 @@ Display version information then exit. =head1 SIGNALS -On receipt of B<SIGUSR1> or B<SIGHUP> virtlockd will re-exec() its -binary, while maintaining all current locks and clients. This allows -for live upgrades of the virtlockd service. +On receipt of B<SIGUSR1> virtlockd will re-exec() its binary, while +maintaining all current locks and clients. This allows for live +upgrades of the virtlockd service. =head1 FILES -- 1.8.5.1

On Tue, Dec 10, 2013 at 03:51:29PM +0100, Michal Privoznik wrote:
This reverts commit 8355d42dd3df514c8584e0e5082b945b79671fc5.
After some discussion upstream [1] this patch turns out to be spurious. It better gets reverted prior to a release.
1: https://www.redhat.com/archives/libvir-list/2013-December/msg00563.html
Signed-off-by: Michal Privoznik <mprivozn@redhat.com> --- src/locking/lock_daemon.c | 2 -- src/locking/virtlockd.pod.in | 6 +++--- 2 files changed, 3 insertions(+), 5 deletions(-)
ACK Daniel -- |: http://berrange.com -o- http://www.flickr.com/photos/dberrange/ :| |: http://libvirt.org -o- http://virt-manager.org :| |: http://autobuild.org -o- http://search.cpan.org/~danberr/ :| |: http://entangle-photo.org -o- http://live.gnome.org/gtk-vnc :|

On 12/10/2013 07:53 AM, Daniel P. Berrange wrote:
On Tue, Dec 10, 2013 at 03:51:29PM +0100, Michal Privoznik wrote:
This reverts commit 8355d42dd3df514c8584e0e5082b945b79671fc5.
After some discussion upstream [1] this patch turns out to be spurious. It better gets reverted prior to a release.
Already pushed, but for next time you write a similar message: s/gets/get/ :) -- Eric Blake eblake redhat com +1-919-301-3266 Libvirt virtualization library http://libvirt.org
participants (3)
-
Daniel P. Berrange
-
Eric Blake
-
Michal Privoznik