Attachment #647936 for bug #721620

View | Details | Raw Unified | Return to bug 721620
Collapse All | Expand All




	$(SYSCONF_FILES) \
	$(OPENRC_CONF_FILES)

install-sysconfig:
	$(MKDIR_P) $(DESTDIR)$(sysconfdir)/sysconfig
	for f in $(SYSCONF_FILES:%.sysconf=%) ; \
	do \
	  tgt=`basename $$f`; \
	  $(INSTALL_DATA) $(srcdir)/$$f.sysconf \
	      $(DESTDIR)$(sysconfdir)/sysconfig/$$tgt; \
	done

uninstall-sysconfig:
	for f in $(SYSCONF_FILES:%.sysconf=%) ; \
	do \
	  tgt=`basename $$f`; \
	  rm -f $(DESTDIR)$(sysconfdir)/sysconfig/$$tgt; \
	done
	rmdir $(DESTDIR)$(sysconfdir)/sysconfig || :

OPENRC_CONF_DIR = $(sysconfdir)/conf.d

install-openrc-conf:

BUILT_SOURCES += $(SYSTEMD_UNIT_FILES)
DISTCLEANFILES += $(SYSTEMD_UNIT_FILES)

install-systemd: $(SYSTEMD_UNIT_FILES)
	$(MKDIR_P) $(DESTDIR)$(SYSTEMD_UNIT_DIR)
	for f in $(SYSTEMD_UNIT_FILES); \
	do \
	  $(INSTALL_DATA) $$f $(DESTDIR)$(SYSTEMD_UNIT_DIR)/ ; \
	done

uninstall-systemd:
	rm -f $(SYSTEMD_UNIT_FILES:%=$(DESTDIR)$(SYSTEMD_UNIT_DIR)/%)
	rmdir $(DESTDIR)$(SYSTEMD_UNIT_DIR) || :


Lines 7-14 Documentation=man:virtlockd(8) Link Here

(-)a/src/locking/virtlockd.service.in (-2 / +1 lines)
7	Documentation=https://libvirt.org	7	Documentation=https://libvirt.org
8		8
9	[Service]	9	[Service]
10	EnvironmentFile=-@sysconfdir@/sysconfig/virtlockd	10	ExecStart=@sbindir@/virtlockd
11	ExecStart=@sbindir@/virtlockd $VIRTLOCKD_ARGS
12	ExecReload=/bin/kill -USR1 $MAINPID	11	ExecReload=/bin/kill -USR1 $MAINPID
13	# Loosing the locks is a really bad thing that will	12	# Loosing the locks is a really bad thing that will
14	# cause the machine to be fenced (rebooted), so make	13	# cause the machine to be fenced (rebooted), so make

Lines 7-14 Documentation=man:virtlogd(8) Link Here

(-)a/src/logging/virtlogd.service.in (-2 / +1 lines)
7	Documentation=https://libvirt.org	7	Documentation=https://libvirt.org
8		8
9	[Service]	9	[Service]
10	EnvironmentFile=-@sysconfdir@/sysconfig/virtlogd	10	ExecStart=@sbindir@/virtlogd
11	ExecStart=@sbindir@/virtlogd $VIRTLOGD_ARGS
12	ExecReload=/bin/kill -USR1 $MAINPID	11	ExecReload=/bin/kill -USR1 $MAINPID
13	# Loosing the logs is a really bad thing that will	12	# Loosing the logs is a really bad thing that will
14	# cause the machine to be fenced (rebooted), so make	13	# cause the machine to be fenced (rebooted), so make

Lines 25-32 Documentation=https://libvirt.org Link Here

(-)a/src/remote/libvirtd.service.in (-2 / +1 lines)
25		25
26	[Service]	26	[Service]
27	Type=notify	27	Type=notify
28	EnvironmentFile=-@sysconfdir@/sysconfig/libvirtd	28	ExecStart=@sbindir@/libvirtd
29	ExecStart=@sbindir@/libvirtd $LIBVIRTD_ARGS
30	ExecReload=/bin/kill -HUP $MAINPID	29	ExecReload=/bin/kill -HUP $MAINPID
31	KillMode=process	30	KillMode=process
32	Restart=on-failure	31	Restart=on-failure




uninstall-local: uninstall-systemd uninstall-nss \
	uninstall-bash-completion

install-sysconfig:
	$(MKDIR_P) $(DESTDIR)$(sysconfdir)/sysconfig
	$(INSTALL_DATA) $(srcdir)/libvirt-guests.sysconf \
	  $(DESTDIR)$(sysconfdir)/sysconfig/libvirt-guests

uninstall-sysconfig:
	rm -f $(DESTDIR)$(sysconfdir)/sysconfig/libvirt-guests
	rmdir $(DESTDIR)$(sysconfdir)/sysconfig ||:

EXTRA_DIST += libvirt-guests.sh.in

libvirt-guests.sh: libvirt-guests.sh.in $(top_builddir)/config.status

SYSTEMD_UNIT_DIR = $(prefix)/lib/systemd/system

if LIBVIRT_INIT_SCRIPT_SYSTEMD
install-systemd: libvirt-guests.service libvirt-guests.sh
	$(MKDIR_P) $(DESTDIR)$(SYSTEMD_UNIT_DIR)
	$(INSTALL_DATA) libvirt-guests.service \
	  $(DESTDIR)$(SYSTEMD_UNIT_DIR)/libvirt-guests.service

uninstall-systemd:
	rm -f $(DESTDIR)$(SYSTEMD_UNIT_DIR)/libvirt-guests.service
	rmdir $(DESTDIR)$(SYSTEMD_UNIT_DIR) ||:


Lines 10-16 Documentation=man:libvirtd(8) Link Here

(-)a/tools/libvirt-guests.service.in (-1 / +1 lines)
10	Documentation=https://libvirt.org	10	Documentation=https://libvirt.org
11		11
12	[Service]	12	[Service]
13	EnvironmentFile=-@sysconfdir@/sysconfig/libvirt-guests	13	EnvironmentFile=-/etc/libvirt/libvirt-guests.conf
14	# Hack just call traditional service until we factor	14	# Hack just call traditional service until we factor
15	# out the code	15	# out the code
16	ExecStart=@libexecdir@/libvirt-guests.sh start	16	ExecStart=@libexecdir@/libvirt-guests.sh start

Lines 3-7 Link Here

(-)a/tools/libvirt-guests.sysconf (+7 lines)
		3	#
		4	# Warning: This configuration file is only sourced by the systemd
		5	# libvirt-guests.service unit. The coresponding openrc facility is in
		6	# /etc/init.d/libvirtd and /etc/conf.d/libvirtd
		7	#
		8
		9
3	# URIs to check for running guests	10	# URIs to check for running guests
4	# example: URIS='default xen:///system vbox+tcp://host/system lxc:///system'	11	# example: URIS='default xen:///system vbox+tcp://host/system lxc:///system'
5	#URIS=default	12	#URIS=default

Return to bug 721620

Lines 533-555 EXTRA_DIST += \ Link Here

(-)a/src/Makefile.am (-19 / +2 lines)
533	$(SYSCONF_FILES) \	533	$(SYSCONF_FILES) \
534	$(OPENRC_CONF_FILES)	534	$(OPENRC_CONF_FILES)
535		535
536	install-sysconfig:
537	$(MKDIR_P) $(DESTDIR)$(sysconfdir)/sysconfig
538	for f in $(SYSCONF_FILES:%.sysconf=%) ; \
539	do \
540	tgt=`basename $$f`; \
541	$(INSTALL_DATA) $(srcdir)/$$f.sysconf \
542	$(DESTDIR)$(sysconfdir)/sysconfig/$$tgt; \
543	done
544
545	uninstall-sysconfig:
546	for f in $(SYSCONF_FILES:%.sysconf=%) ; \
547	do \
548	tgt=`basename $$f`; \
549	rm -f $(DESTDIR)$(sysconfdir)/sysconfig/$$tgt; \
550	done
551	rmdir $(DESTDIR)$(sysconfdir)/sysconfig \|\| :
552
553	OPENRC_CONF_DIR = $(sysconfdir)/conf.d	536	OPENRC_CONF_DIR = $(sysconfdir)/conf.d
554		537
555	install-openrc-conf:	538	install-openrc-conf:
Lines 615-628 SYSTEMD_UNIT_DIR = $(prefix)/lib/systemd/system Link Here
615	BUILT_SOURCES += $(SYSTEMD_UNIT_FILES)	598	BUILT_SOURCES += $(SYSTEMD_UNIT_FILES)
616	DISTCLEANFILES += $(SYSTEMD_UNIT_FILES)	599	DISTCLEANFILES += $(SYSTEMD_UNIT_FILES)
617		600
618	install-systemd: $(SYSTEMD_UNIT_FILES) install-sysconfig	601	install-systemd: $(SYSTEMD_UNIT_FILES)
619	$(MKDIR_P) $(DESTDIR)$(SYSTEMD_UNIT_DIR)	602	$(MKDIR_P) $(DESTDIR)$(SYSTEMD_UNIT_DIR)
620	for f in $(SYSTEMD_UNIT_FILES); \	603	for f in $(SYSTEMD_UNIT_FILES); \
621	do \	604	do \
622	$(INSTALL_DATA) $$f $(DESTDIR)$(SYSTEMD_UNIT_DIR)/ ; \	605	$(INSTALL_DATA) $$f $(DESTDIR)$(SYSTEMD_UNIT_DIR)/ ; \
623	done	606	done
624		607
625	uninstall-systemd: uninstall-sysconfig	608	uninstall-systemd:
626	rm -f $(SYSTEMD_UNIT_FILES:%=$(DESTDIR)$(SYSTEMD_UNIT_DIR)/%)	609	rm -f $(SYSTEMD_UNIT_FILES:%=$(DESTDIR)$(SYSTEMD_UNIT_DIR)/%)
627	rmdir $(DESTDIR)$(SYSTEMD_UNIT_DIR) \|\| :	610	rmdir $(DESTDIR)$(SYSTEMD_UNIT_DIR) \|\| :
628		611

Lines 297-311 install-data-local: install-systemd install-nss \ Link Here

(-)a/tools/Makefile.am (-11 / +2 lines)
297	uninstall-local: uninstall-systemd uninstall-nss \	297	uninstall-local: uninstall-systemd uninstall-nss \
298	uninstall-bash-completion	298	uninstall-bash-completion
299		299
300	install-sysconfig:
301	$(MKDIR_P) $(DESTDIR)$(sysconfdir)/sysconfig
302	$(INSTALL_DATA) $(srcdir)/libvirt-guests.sysconf \
303	$(DESTDIR)$(sysconfdir)/sysconfig/libvirt-guests
304
305	uninstall-sysconfig:
306	rm -f $(DESTDIR)$(sysconfdir)/sysconfig/libvirt-guests
307	rmdir $(DESTDIR)$(sysconfdir)/sysconfig \|\|:
308
309	EXTRA_DIST += libvirt-guests.sh.in	300	EXTRA_DIST += libvirt-guests.sh.in
310		301
311	libvirt-guests.sh: libvirt-guests.sh.in $(top_builddir)/config.status	302	libvirt-guests.sh: libvirt-guests.sh.in $(top_builddir)/config.status
Lines 325-336 EXTRA_DIST += libvirt-guests.service.in Link Here
325	SYSTEMD_UNIT_DIR = $(prefix)/lib/systemd/system	316	SYSTEMD_UNIT_DIR = $(prefix)/lib/systemd/system
326		317
327	if LIBVIRT_INIT_SCRIPT_SYSTEMD	318	if LIBVIRT_INIT_SCRIPT_SYSTEMD
328	install-systemd: libvirt-guests.service install-sysconfig libvirt-guests.sh	319	install-systemd: libvirt-guests.service libvirt-guests.sh
329	$(MKDIR_P) $(DESTDIR)$(SYSTEMD_UNIT_DIR)	320	$(MKDIR_P) $(DESTDIR)$(SYSTEMD_UNIT_DIR)
330	$(INSTALL_DATA) libvirt-guests.service \	321	$(INSTALL_DATA) libvirt-guests.service \
331	$(DESTDIR)$(SYSTEMD_UNIT_DIR)/libvirt-guests.service	322	$(DESTDIR)$(SYSTEMD_UNIT_DIR)/libvirt-guests.service
332		323
333	uninstall-systemd: uninstall-sysconfig	324	uninstall-systemd:
334	rm -f $(DESTDIR)$(SYSTEMD_UNIT_DIR)/libvirt-guests.service	325	rm -f $(DESTDIR)$(SYSTEMD_UNIT_DIR)/libvirt-guests.service
335	rmdir $(DESTDIR)$(SYSTEMD_UNIT_DIR) \|\|:	326	rmdir $(DESTDIR)$(SYSTEMD_UNIT_DIR) \|\|:
336		327