Rename init script

diff --git a/ChangeLog b/ChangeLog
index 640844c2b9af03d5833a6c95d5319e8bae4e1dc3..8af14abe1533e43bd7f0335d6944dccc3a22c0b7 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Tue Jun 26 19:02:00 EST 2007 Daniel P. Berrange <berrange@redhat.com>
+
+       * qemud/libvirtd.in, qemud/libvirtd.init.in, qemud/Makefile.am
+       rename the init script to not clash with forthcoming daemon
+       name change.
+
 Tue Jun 26 18:57:00 EST 2007 Daniel P. Berrange <berrange@redhat.com>
 
        * qemud/Makefile.am, qemud/bridge.c, configure.in, libvirt.spec.in

diff --git a/qemud/Makefile.am b/qemud/Makefile.am
index 3cb81ef714491b797ed5542a3f3e02435c0ee11f..7625a98e233cc3fe5aa421d2b3e86bac57050a4d 100644 (file)
--- a/qemud/Makefile.am
+++ b/qemud/Makefile.am
@@ -32,7 +32,7 @@ libvirt_qemud_LDFLAGS = $(WARN_CFLAGS) $(LIBXML_LIBS)
 libvirt_qemud_DEPENDENCIES = ../src/libvirt.la
 libvirt_qemud_LDADD = ../src/libvirt.la
 
-install-data-local:
+install-data-local: install-init
        mkdir -p $(DESTDIR)$(sysconfdir)/libvirt/qemu/networks/autostart
        $(INSTALL_DATA) $(srcdir)/default-network.xml $(DESTDIR)$(sysconfdir)/libvirt/qemu/networks/default.xml
        sed -i -e "s,</name>,</name>\n  <uuid>$(UUID)</uuid>," $(DESTDIR)$(sysconfdir)/libvirt/qemu/networks/default.xml
@@ -42,7 +42,7 @@ install-data-local:
        mkdir -p $(DESTDIR)$(localstatedir)/run/libvirt
        mkdir -p $(DESTDIR)$(localstatedir)/lib/libvirt
 
-uninstall-local:
+uninstall-local: uninstall-init
        rm -f $(DESTDIR)$(sysconfdir)/libvirt/qemu/networks/autostart/default.xml
        rm -f $(DESTDIR)$(sysconfdir)/libvirt/qemu/networks/default.xml
        rmdir $(DESTDIR)$(sysconfdir)/libvirt/qemu/networks/autostart || :
@@ -52,7 +52,7 @@ uninstall-local:
 
 # Distribute the generated files so that rpcgen isn't required on the
 # target machine (although almost any Unix machine will have it).
-EXTRA_DIST = libvirtd.in default-network.xml \
+EXTRA_DIST = libvirtd.init.in default-network.xml \
        protocol.x remote_protocol.x \
        protocol.c protocol.h \
        remote_protocol.c remote_protocol.h \
@@ -88,16 +88,25 @@ remote_dispatch_proc_switch.h: remote_generate_stubs.pl remote_protocol.x
        perl -w remote_generate_stubs.pl -w remote_protocol.x > $@
 
 if LIBVIRT_INIT_SCRIPTS_RED_HAT
-initdir = $(sysconfdir)/rc.d/init.d
-init_SCRIPTS = libvirtd
+install-init: libvirtd.init
+       mkdir -p $(DESTDIR)$(sysconfdir)/rc.d/init.d
+       $(INSTALL_SCRIPT) $(srcdir)/libvirtd.init $(DESTDIR)$(sysconfdir)/rc.d/init.d/libvirtd
 
-libvirtd: libvirtd.in
+uninstall-init:
+       rm -f $(DESTDIR)$(sysconfdir)/rc.d/init.d/libvirtd
+
+libvirtd.init: libvirtd.init.in
        sed                                             \
            -e s!\@localstatedir\@!@localstatedir@!     \
            -e s!\@sbindir\@!@sbindir@!                 \
            -e s!\@sysconfdir\@!@sysconfdir@!           \
            < $< > $@
-       chmod a+x libvirtd
+       chmod a+x libvirtd.init
+
+CLEANFILES = libvirtd.init
+else
+
+install-init:
+uninstall-init:
 
-CLEANFILES = libvirtd
 endif # DBUS_INIT_SCRIPTS_RED_HAT

diff --git a/qemud/libvirtd.in b/qemud/libvirtd.init.in
similarity index 100%
rename from qemud/libvirtd.in
rename to qemud/libvirtd.init.in