mirror of
https://gitlab.com/libvirt/libvirt.git
synced 2024-09-08 16:54:49 +00:00
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.
This commit is contained in:
parent
5cb7316372
commit
2c090a555b
@ -35,8 +35,6 @@ EXTRA_DIST = \
|
|||||||
libvirtd.uml.logrotate.in \
|
libvirtd.uml.logrotate.in \
|
||||||
test_libvirtd.aug \
|
test_libvirtd.aug \
|
||||||
THREADING.txt \
|
THREADING.txt \
|
||||||
libvirt-guests.init.in \
|
|
||||||
libvirt-guests.sysconf \
|
|
||||||
libvirtd.pod.in \
|
libvirtd.pod.in \
|
||||||
$(AVAHI_SOURCES) \
|
$(AVAHI_SOURCES) \
|
||||||
$(DAEMON_SOURCES)
|
$(DAEMON_SOURCES)
|
||||||
@ -258,27 +256,21 @@ install-logrotate: $(LOGROTATE_CONFS)
|
|||||||
$(INSTALL_DATA) libvirtd.uml.logrotate $(DESTDIR)$(sysconfdir)/logrotate.d/libvirtd.uml
|
$(INSTALL_DATA) libvirtd.uml.logrotate $(DESTDIR)$(sysconfdir)/logrotate.d/libvirtd.uml
|
||||||
|
|
||||||
if LIBVIRT_INIT_SCRIPT_RED_HAT
|
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
|
mkdir -p $(DESTDIR)$(sysconfdir)/rc.d/init.d
|
||||||
$(INSTALL_SCRIPT) libvirtd.init \
|
$(INSTALL_SCRIPT) libvirtd.init \
|
||||||
$(DESTDIR)$(sysconfdir)/rc.d/init.d/libvirtd
|
$(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
|
mkdir -p $(DESTDIR)$(sysconfdir)/sysconfig
|
||||||
$(INSTALL_SCRIPT) $(srcdir)/libvirtd.sysconf \
|
$(INSTALL_SCRIPT) $(srcdir)/libvirtd.sysconf \
|
||||||
$(DESTDIR)$(sysconfdir)/sysconfig/libvirtd
|
$(DESTDIR)$(sysconfdir)/sysconfig/libvirtd
|
||||||
$(INSTALL_SCRIPT) $(srcdir)/libvirt-guests.sysconf \
|
|
||||||
$(DESTDIR)$(sysconfdir)/sysconfig/libvirt-guests
|
|
||||||
|
|
||||||
uninstall-init:
|
uninstall-init:
|
||||||
rm -f $(DESTDIR)$(sysconfdir)/rc.d/init.d/libvirtd \
|
rm -f $(DESTDIR)$(sysconfdir)/rc.d/init.d/libvirtd \
|
||||||
$(DESTDIR)$(sysconfdir)/sysconfig/libvirtd \
|
$(DESTDIR)$(sysconfdir)/sysconfig/libvirtd
|
||||||
$(DESTDIR)$(sysconfdir)/rc.d/init.d/libvirt-guests \
|
|
||||||
$(DESTDIR)$(sysconfdir)/sysconfig/libvirt-guests
|
|
||||||
|
|
||||||
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 \
|
$(AM_V_GEN)sed \
|
||||||
-e s!\@localstatedir\@!@localstatedir@!g \
|
-e s!\@localstatedir\@!@localstatedir@!g \
|
||||||
-e s!\@sbindir\@!@sbindir@!g \
|
-e s!\@sbindir\@!@sbindir@!g \
|
||||||
|
@ -8,7 +8,13 @@ ICON_FILES = \
|
|||||||
libvirt_win_icon_64x64.ico \
|
libvirt_win_icon_64x64.ico \
|
||||||
virsh_win_icon.rc
|
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_SCRIPTS = virt-xml-validate virt-pki-validate
|
||||||
bin_PROGRAMS = virsh
|
bin_PROGRAMS = virsh
|
||||||
@ -118,6 +124,39 @@ endif
|
|||||||
virsh.1: virsh.pod
|
virsh.1: virsh.pod
|
||||||
$(AM_V_GEN)$(POD2MAN) $< $@
|
$(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)
|
CLEANFILES = $(bin_SCRIPTS) $(man1_MANS)
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user