[Libvir] PATCH 18/20: rename the daemon

[Daniel P. Berrange]

This patch renames the daemon from libvirt_qemud to libvirtd and fixes the
specfile and init script to take account

 libvirt.spec.in        |    2 +-
 qemud/Makefile.am      |   12 ++++++------
 qemud/libvirtd.init.in |    4 ++--
 3 files changed, 9 insertions(+), 9 deletions(-)


Dan.
-- 
|=- Red Hat, Engineering, Emerging Technologies, Boston.  +1 978 392 2496 -=|
|=-           Perl modules: http://search.cpan.org/~danberr/              -=|
|=-               Projects: http://freshmeat.net/~danielpb/               -=|
|=-  GnuPG: 7D3B9505   F3C9 553F A1DA 4AC2 5648 23C1 B3DF F742 7D3B 9505  -=| 
-------------- next part --------------
diff -r b385f70efffd libvirt.spec.in
--- a/libvirt.spec.in	Thu Jun 21 20:28:56 2007 -0400
+++ b/libvirt.spec.in	Thu Jun 21 20:32:14 2007 -0400
@@ -135,7 +135,7 @@ fi
 %dir %{_localstatedir}/lib/libvirt/
 %dir %attr(0700, root, root) %{_localstatedir}/log/libvirt/qemu/
 %attr(4755, root, root) %{_libexecdir}/libvirt_proxy
-%attr(0755, root, root) %{_sbindir}/libvirt_qemud
+%attr(0755, root, root) %{_sbindir}/libvirtd
 %doc docs/libvirt.rng
 
 %files devel
diff -r b385f70efffd qemud/Makefile.am
--- a/qemud/Makefile.am	Thu Jun 21 20:28:56 2007 -0400
+++ b/qemud/Makefile.am	Thu Jun 21 20:31:08 2007 -0400
@@ -3,9 +3,9 @@ INCLUDES = @LIBXML_CFLAGS@
 INCLUDES = @LIBXML_CFLAGS@
 UUID=$(shell uuidgen)
 
-sbin_PROGRAMS = libvirt_qemud
+sbin_PROGRAMS = libvirtd
 
-libvirt_qemud_SOURCES = \
+libvirtd_SOURCES = \
 		qemud.c internal.h \
                 driver.c driver.h \
                 dispatch.c dispatch.h \
@@ -20,7 +20,7 @@ libvirt_qemud_SOURCES = \
                 ../src/virterror.c \
                 event.c event.h
 #-D_XOPEN_SOURCE=600 -D_XOPEN_SOURCE_EXTENDED=1 -D_POSIX_C_SOURCE=199506L
-libvirt_qemud_CFLAGS = \
+libvirtd_CFLAGS = \
         -I$(top_srcdir)/include -I$(top_builddir)/include $(LIBXML_CFLAGS) \
         $(WARN_CFLAGS) -DLOCAL_STATE_DIR="\"$(localstatedir)\"" \
         -DSYSCONF_DIR="\"$(sysconfdir)\"" \
@@ -28,9 +28,9 @@ libvirt_qemud_CFLAGS = \
 	-DREMOTE_PID_FILE="\"$(REMOTE_PID_FILE)\"" \
         -DGETTEXT_PACKAGE=\"$(PACKAGE)\"
 
-libvirt_qemud_LDFLAGS = $(WARN_CFLAGS) $(LIBXML_LIBS)
-libvirt_qemud_DEPENDENCIES = ../src/libvirt.la
-libvirt_qemud_LDADD = ../src/libvirt.la
+libvirtd_LDFLAGS = $(WARN_CFLAGS) $(LIBXML_LIBS)
+libvirtd_DEPENDENCIES = ../src/libvirt.la
+libvirtd_LDADD = ../src/libvirt.la
 
 install-data-local: install-init
 	mkdir -p $(DESTDIR)$(sysconfdir)/libvirt/qemu/networks/autostart
diff -r b385f70efffd qemud/libvirtd.init.in
--- a/qemud/libvirtd.init.in	Thu Jun 21 20:28:56 2007 -0400
+++ b/qemud/libvirtd.init.in	Thu Jun 21 20:31:31 2007 -0400
@@ -12,13 +12,13 @@
 #
 
 # Sanity checks.
-[ -x @sbindir@/libvirt_qemud ] || exit 0
+[ -x @sbindir@/libvirtd ] || exit 0
 
 # Source function library.
 . @sysconfdir@/rc.d/init.d/functions
 
 SERVICE=libvirtd
-PROCESS=libvirt_qemud
+PROCESS=libvirtd
 
 
 RETVAL=0