Move libvirt-guests init script and config to tools

Since libvirt-guests init script and its configuration do not require
libvirtd to be running/installed, it was a bad idea to put them into
daemon directory. libvirt.spec even includes these files in
libvirt-client subpackage, which may result in build failure for
client-only builds when the whole daemon directory is just skipped.

diff --git a/daemon/Makefile.am b/daemon/Makefile.am
index dbf0ac3e38d1a59e9dc62af78673f57eb568de09..53133d2b94fa187db129aa6c672a5aab103172b0 100644 (file)
--- a/daemon/Makefile.am
+++ b/daemon/Makefile.am
@@ -35,8 +35,6 @@ EXTRA_DIST =                                          \
        libvirtd.uml.logrotate.in                       \
        test_libvirtd.aug                               \
        THREADING.txt                                   \
-       libvirt-guests.init.in                          \
-       libvirt-guests.sysconf                          \
        libvirtd.pod.in                                 \
        $(AVAHI_SOURCES)                                \
        $(DAEMON_SOURCES)
@@ -258,27 +256,21 @@ install-logrotate: $(LOGROTATE_CONFS)
        $(INSTALL_DATA) libvirtd.uml.logrotate $(DESTDIR)$(sysconfdir)/logrotate.d/libvirtd.uml
 
 if LIBVIRT_INIT_SCRIPT_RED_HAT
-install-init: libvirtd.init libvirt-guests.init
+install-init: libvirtd.init
        mkdir -p $(DESTDIR)$(sysconfdir)/rc.d/init.d
        $(INSTALL_SCRIPT) libvirtd.init \
          $(DESTDIR)$(sysconfdir)/rc.d/init.d/libvirtd
-       $(INSTALL_SCRIPT) libvirt-guests.init \
-         $(DESTDIR)$(sysconfdir)/rc.d/init.d/libvirt-guests
        mkdir -p $(DESTDIR)$(sysconfdir)/sysconfig
        $(INSTALL_SCRIPT) $(srcdir)/libvirtd.sysconf \
          $(DESTDIR)$(sysconfdir)/sysconfig/libvirtd
-       $(INSTALL_SCRIPT) $(srcdir)/libvirt-guests.sysconf \
-         $(DESTDIR)$(sysconfdir)/sysconfig/libvirt-guests
 
 uninstall-init:
        rm -f $(DESTDIR)$(sysconfdir)/rc.d/init.d/libvirtd \
-               $(DESTDIR)$(sysconfdir)/sysconfig/libvirtd \
-               $(DESTDIR)$(sysconfdir)/rc.d/init.d/libvirt-guests \
-               $(DESTDIR)$(sysconfdir)/sysconfig/libvirt-guests
+               $(DESTDIR)$(sysconfdir)/sysconfig/libvirtd
 
-BUILT_SOURCES += libvirtd.init libvirt-guests.init
+BUILT_SOURCES += libvirtd.init
 
-%.init: %.init.in $(top_builddir)/config.status
+libvirtd.init: libvirtd.init.in $(top_builddir)/config.status
        $(AM_V_GEN)sed                                  \
            -e s!\@localstatedir\@!@localstatedir@!g    \
            -e s!\@sbindir\@!@sbindir@!g                \

diff --git a/tools/Makefile.am b/tools/Makefile.am
index fd05e8bd26ca827260b99777d115e0118878645c..ac26caed1dbcc28c7e13908e69d5ab515fe5351d 100644 (file)
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -8,7 +8,13 @@ ICON_FILES = \
        libvirt_win_icon_64x64.ico \
        virsh_win_icon.rc
 
-EXTRA_DIST = $(ICON_FILES) virt-xml-validate.in virt-pki-validate.in virsh.pod
+EXTRA_DIST = \
+       $(ICON_FILES)                                   \
+       virt-xml-validate.in                            \
+       virt-pki-validate.in                            \
+       virsh.pod                                       \
+       libvirt-guests.init.in                          \
+       libvirt-guests.sysconf
 
 bin_SCRIPTS = virt-xml-validate virt-pki-validate
 bin_PROGRAMS = virsh
@@ -118,6 +124,39 @@ endif
 virsh.1: virsh.pod
        $(AM_V_GEN)$(POD2MAN) $< $@
 
+install-data-local: install-init
+
+uninstall-local: uninstall-init
+
+if LIBVIRT_INIT_SCRIPT_RED_HAT
+install-init: libvirt-guests.init
+       mkdir -p $(DESTDIR)$(sysconfdir)/rc.d/init.d
+       $(INSTALL_SCRIPT) libvirt-guests.init \
+         $(DESTDIR)$(sysconfdir)/rc.d/init.d/libvirt-guests
+       mkdir -p $(DESTDIR)$(sysconfdir)/sysconfig
+       $(INSTALL_SCRIPT) $(srcdir)/libvirt-guests.sysconf \
+         $(DESTDIR)$(sysconfdir)/sysconfig/libvirt-guests
+
+uninstall-init:
+       rm -f $(DESTDIR)$(sysconfdir)/rc.d/init.d/libvirt-guests \
+         $(DESTDIR)$(sysconfdir)/sysconfig/libvirt-guests
+
+BUILT_SOURCES += libvirt-guests.init
+
+libvirt-guests.init: libvirt-guests.init.in $(top_builddir)/config.status
+       $(AM_V_GEN)sed                                  \
+           -e s!\@localstatedir\@!@localstatedir@!g    \
+           -e s!\@sbindir\@!@sbindir@!g                \
+           -e s!\@sysconfdir\@!@sysconfdir@!g          \
+           < $< > $@-t &&                              \
+           chmod a+x $@-t &&                           \
+           mv $@-t $@
+else
+install-init:
+uninstall-init:
+libvirt-guests.init:
+endif # LIBVIRT_INIT_SCRIPT_RED_HAT
+
 
 CLEANFILES = $(bin_SCRIPTS) $(man1_MANS)
 

diff --git a/daemon/libvirt-guests.init.in b/tools/libvirt-guests.init.in
similarity index 100%
rename from daemon/libvirt-guests.init.in
rename to tools/libvirt-guests.init.in

diff --git a/daemon/libvirt-guests.sysconf b/tools/libvirt-guests.sysconf
similarity index 100%
rename from daemon/libvirt-guests.sysconf
rename to tools/libvirt-guests.sysconf