[libvirt] [PATCH 2/4] Replace unset REMOTE_PID_FILE with proper value

Doug Goldstein cardoe at cardoe.com
Mon Aug 13 04:44:48 UTC 2012


REMOTE_PID_FILE is no longer used in the source or the build process but
the man page still used it resulting in no file name being displayed.
The same value that the libvirtd daemon code uses is now used in the man
page.
---
 daemon/Makefile.am     |    4 +---
 daemon/libvirtd.pod.in |    6 +++---
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/daemon/Makefile.am b/daemon/Makefile.am
index c15c785..b00fc13 100644
--- a/daemon/Makefile.am
+++ b/daemon/Makefile.am
@@ -87,7 +87,6 @@ libvirtd.8: $(srcdir)/libvirtd.8.in
 	sed \
 	    -e 's!SYSCONFDIR!$(sysconfdir)!g' \
 	    -e 's!LOCALSTATEDIR!$(localstatedir)!g' \
-	    -e 's!REMOTE_PID_FILE!$(REMOTE_PID_FILE)!g' \
 	    < $< > $@-t
 	mv $@-t $@
 
@@ -99,8 +98,7 @@ libvirtd_CFLAGS = \
 	$(XDR_CFLAGS) $(POLKIT_CFLAGS) $(DBUS_CFLAGS) $(LIBNL_CFLAGS) \
 	$(WARN_CFLAGS) \
 	$(COVERAGE_CFLAGS) \
-	-DQEMUD_PID_FILE="\"$(QEMUD_PID_FILE)\"" \
-	-DREMOTE_PID_FILE="\"$(REMOTE_PID_FILE)\""
+	-DQEMUD_PID_FILE="\"$(QEMUD_PID_FILE)\""
 
 libvirtd_LDFLAGS =					\
 	$(WARN_CFLAGS)					\
diff --git a/daemon/libvirtd.pod.in b/daemon/libvirtd.pod.in
index 7dc8d83..2b68cab 100644
--- a/daemon/libvirtd.pod.in
+++ b/daemon/libvirtd.pod.in
@@ -104,7 +104,7 @@ The TLS B<Server> certificate libvirtd will use.
 
 The TLS B<Server> private key libvirtd will use.
 
-=item F<REMOTE_PID_FILE>
+=item F<LOCALSTATEDIR/run/libvirtd.pid>
 
 The PID file to use, unless overridden by the B<-p>|B<--pid-file> option.
 
@@ -121,8 +121,8 @@ To retrieve the version of libvirtd:
 To start libvirtd, instructing it to daemonize and create a PID file:
 
  # libvirtd -d
- # ls -la REMOTE_PID_FILE
- -rw-r--r-- 1 root root 6 Jul  9 02:40 REMOTE_PID_FILE
+ # ls -la LOCALSTATEDIR/run/libvirtd.pid
+ -rw-r--r-- 1 root root 6 Jul  9 02:40 LOCALSTATEDIR/run/libvirtd.pid
  #
 
 =head1 BUGS
-- 
1.7.8.6




More information about the libvir-list mailing list