diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2019-03-19 11:37:34 +0000 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2019-03-19 11:37:34 +0000 |
commit | b7b97785ebbb2f11d24d14dab8b81ed274f4ce6a (patch) | |
tree | 9fd110f9fc996e8a4213eeda994a8c112491b86d /app-emulation/libvirt/files | |
parent | 066d27181e9a797ad9f8fc43b49fc9a10ff2f707 (diff) |
gentoo resync : 19.03.2019
Diffstat (limited to 'app-emulation/libvirt/files')
-rw-r--r-- | app-emulation/libvirt/files/libvirt-5.1.0-do-not-use-sysconf.patch | 34 | ||||
-rw-r--r-- | app-emulation/libvirt/files/libvirt-5.2.0-do-not-use-sysconf.patch | 170 |
2 files changed, 177 insertions, 27 deletions
diff --git a/app-emulation/libvirt/files/libvirt-5.1.0-do-not-use-sysconf.patch b/app-emulation/libvirt/files/libvirt-5.1.0-do-not-use-sysconf.patch index 3c32ab81f1d6..ff8bde45f0e1 100644 --- a/app-emulation/libvirt/files/libvirt-5.1.0-do-not-use-sysconf.patch +++ b/app-emulation/libvirt/files/libvirt-5.1.0-do-not-use-sysconf.patch @@ -1,22 +1,5 @@ -From cbc26250bcdc4eb3b1c4e7e09c824f3504d41b27 Mon Sep 17 00:00:00 2001 -Message-Id: <cbc26250bcdc4eb3b1c4e7e09c824f3504d41b27.1548428073.git.mprivozn@redhat.com> -From: Michal Privoznik <mprivozn@redhat.com> -Date: Tue, 26 Jun 2018 06:51:06 +0200 -Subject: [PATCH] gentoo: do not use sysconf - -Signed-off-by: Michal Privoznik <mprivozn@redhat.com> ---- - src/Makefile.am | 29 ++++++----------------------- - src/locking/virtlockd.service.in | 3 +-- - src/logging/virtlogd.service.in | 3 +-- - src/remote/libvirtd.service.in | 3 +-- - tools/Makefile.am | 17 ++++------------- - tools/libvirt-guests.service.in | 2 +- - tools/libvirt-guests.sysconf | 7 +++++++ - 7 files changed, 21 insertions(+), 43 deletions(-) - diff --git a/src/Makefile.am b/src/Makefile.am -index 8c8dfe3dcf..25ced3abf3 100644 +index 8c8dfe3..25ced3a 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -756,23 +756,6 @@ endif WITH_SETUID_RPC_CLIENT @@ -96,7 +79,7 @@ index 8c8dfe3dcf..25ced3abf3 100644 do \ tgt=`basename $$f` ; \ diff --git a/src/locking/virtlockd.service.in b/src/locking/virtlockd.service.in -index 3c9d587032..2449b201d9 100644 +index 3c9d587..2449b20 100644 --- a/src/locking/virtlockd.service.in +++ b/src/locking/virtlockd.service.in @@ -7,8 +7,7 @@ Documentation=man:virtlockd(8) @@ -110,7 +93,7 @@ index 3c9d587032..2449b201d9 100644 # Loosing the locks is a really bad thing that will # cause the machine to be fenced (rebooted), so make diff --git a/src/logging/virtlogd.service.in b/src/logging/virtlogd.service.in -index 3d9ae36150..43736191d5 100644 +index 3d9ae36..4373619 100644 --- a/src/logging/virtlogd.service.in +++ b/src/logging/virtlogd.service.in @@ -7,8 +7,7 @@ Documentation=man:virtlogd(8) @@ -124,7 +107,7 @@ index 3d9ae36150..43736191d5 100644 # Loosing the logs is a really bad thing that will # cause the machine to be fenced (rebooted), so make diff --git a/src/remote/libvirtd.service.in b/src/remote/libvirtd.service.in -index 7f689e08a8..239beeced9 100644 +index 7f689e0..239beec 100644 --- a/src/remote/libvirtd.service.in +++ b/src/remote/libvirtd.service.in @@ -22,8 +22,7 @@ Documentation=https://libvirt.org @@ -138,7 +121,7 @@ index 7f689e08a8..239beeced9 100644 KillMode=process Restart=on-failure diff --git a/tools/Makefile.am b/tools/Makefile.am -index 613c9a77f0..224b511074 100644 +index f2f84f7..1188d3c 100644 --- a/tools/Makefile.am +++ b/tools/Makefile.am @@ -339,15 +339,6 @@ install-data-local: install-init install-systemd install-nss \ @@ -184,7 +167,7 @@ index 613c9a77f0..224b511074 100644 rmdir $(DESTDIR)$(SYSTEMD_UNIT_DIR) ||: diff --git a/tools/libvirt-guests.service.in b/tools/libvirt-guests.service.in -index 491ca62138..f0f417bffb 100644 +index 491ca62..f0f417b 100644 --- a/tools/libvirt-guests.service.in +++ b/tools/libvirt-guests.service.in @@ -10,7 +10,7 @@ Documentation=man:libvirtd(8) @@ -197,7 +180,7 @@ index 491ca62138..f0f417bffb 100644 # out the code ExecStart=@libexecdir@/libvirt-guests.sh start diff --git a/tools/libvirt-guests.sysconf b/tools/libvirt-guests.sysconf -index 669b046507..45b0b9ea46 100644 +index 669b046..45b0b9e 100644 --- a/tools/libvirt-guests.sysconf +++ b/tools/libvirt-guests.sysconf @@ -1,3 +1,10 @@ @@ -211,6 +194,3 @@ index 669b046507..45b0b9ea46 100644 # URIs to check for running guests # example: URIS='default xen:///system vbox+tcp://host/system lxc:///system' #URIS=default --- -2.19.2 - diff --git a/app-emulation/libvirt/files/libvirt-5.2.0-do-not-use-sysconf.patch b/app-emulation/libvirt/files/libvirt-5.2.0-do-not-use-sysconf.patch new file mode 100644 index 000000000000..292af16b4915 --- /dev/null +++ b/app-emulation/libvirt/files/libvirt-5.2.0-do-not-use-sysconf.patch @@ -0,0 +1,170 @@ +From 525d89d39f78a4099508f47a58c4ab65d1e59c0a Mon Sep 17 00:00:00 2001 +Message-Id: <525d89d39f78a4099508f47a58c4ab65d1e59c0a.1552736006.git.mprivozn@redhat.com> +From: Michal Privoznik <mprivozn@redhat.com> +Date: Sat, 16 Mar 2019 12:33:00 +0100 +Subject: [PATCH] gentoo: do not use sysconf + +Signed-off-by: Michal Privoznik <mprivozn@redhat.com> +--- + src/Makefile.am | 21 ++------------------- + src/locking/virtlockd.service.in | 3 +-- + src/logging/virtlogd.service.in | 3 +-- + src/remote/libvirtd.service.in | 3 +-- + tools/Makefile.am | 13 ++----------- + tools/libvirt-guests.service.in | 2 +- + tools/libvirt-guests.sysconf | 7 +++++++ + 7 files changed, 15 insertions(+), 37 deletions(-) + +diff --git a/src/Makefile.am b/src/Makefile.am +index a73f43c483..47dd55c112 100644 +--- a/src/Makefile.am ++++ b/src/Makefile.am +@@ -747,23 +747,6 @@ endif WITH_SETUID_RPC_CLIENT + + EXTRA_DIST += $(SYSCONF_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 || : +- + LOGROTATE_FILES := $(LOGROTATE_FILES_IN:remote/%.in=%) + + EXTRA_DIST += $(LOGROTATE_FILES_IN) +@@ -822,14 +805,14 @@ SYSTEMD_UNIT_FILES = $(notdir $(SYSTEMD_UNIT_FILES_IN:%.in=%)) + BUILT_SOURCES += $(SYSTEMD_UNIT_FILES) + DISTCLEANFILES += $(SYSTEMD_UNIT_FILES) + +-install-systemd: $(SYSTEMD_UNIT_FILES) install-sysconfig ++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: uninstall-sysconfig ++uninstall-systemd: + rm -f $(SYSTEMD_UNIT_FILES:%=$(DESTDIR)$(SYSTEMD_UNIT_DIR)/%) + rmdir $(DESTDIR)$(SYSTEMD_UNIT_DIR) || : + +diff --git a/src/locking/virtlockd.service.in b/src/locking/virtlockd.service.in +index 3c9d587032..2449b201d9 100644 +--- a/src/locking/virtlockd.service.in ++++ b/src/locking/virtlockd.service.in +@@ -7,8 +7,7 @@ Documentation=man:virtlockd(8) + Documentation=https://libvirt.org + + [Service] +-EnvironmentFile=-/etc/sysconfig/virtlockd +-ExecStart=@sbindir@/virtlockd $VIRTLOCKD_ARGS ++ExecStart=@sbindir@/virtlockd + ExecReload=/bin/kill -USR1 $MAINPID + # Loosing the locks is a really bad thing that will + # cause the machine to be fenced (rebooted), so make +diff --git a/src/logging/virtlogd.service.in b/src/logging/virtlogd.service.in +index 3d9ae36150..43736191d5 100644 +--- a/src/logging/virtlogd.service.in ++++ b/src/logging/virtlogd.service.in +@@ -7,8 +7,7 @@ Documentation=man:virtlogd(8) + Documentation=https://libvirt.org + + [Service] +-EnvironmentFile=-/etc/sysconfig/virtlogd +-ExecStart=@sbindir@/virtlogd $VIRTLOGD_ARGS ++ExecStart=@sbindir@/virtlogd + ExecReload=/bin/kill -USR1 $MAINPID + # Loosing the logs is a really bad thing that will + # cause the machine to be fenced (rebooted), so make +diff --git a/src/remote/libvirtd.service.in b/src/remote/libvirtd.service.in +index 7f689e08a8..239beeced9 100644 +--- a/src/remote/libvirtd.service.in ++++ b/src/remote/libvirtd.service.in +@@ -22,8 +22,7 @@ Documentation=https://libvirt.org + + [Service] + Type=notify +-EnvironmentFile=-/etc/sysconfig/libvirtd +-ExecStart=@sbindir@/libvirtd $LIBVIRTD_ARGS ++ExecStart=@sbindir@/libvirtd + ExecReload=/bin/kill -HUP $MAINPID + KillMode=process + Restart=on-failure +diff --git a/tools/Makefile.am b/tools/Makefile.am +index c6064dee08..40f41ddb38 100644 +--- a/tools/Makefile.am ++++ b/tools/Makefile.am +@@ -333,15 +333,6 @@ install-data-local: install-systemd install-nss \ + 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 +@@ -361,12 +352,12 @@ EXTRA_DIST += libvirt-guests.service.in + SYSTEMD_UNIT_DIR = $(prefix)/lib/systemd/system + + if LIBVIRT_INIT_SCRIPT_SYSTEMD +-install-systemd: libvirt-guests.service install-sysconfig libvirt-guests.sh ++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: uninstall-sysconfig ++uninstall-systemd: + rm -f $(DESTDIR)$(SYSTEMD_UNIT_DIR)/libvirt-guests.service + rmdir $(DESTDIR)$(SYSTEMD_UNIT_DIR) ||: + +diff --git a/tools/libvirt-guests.service.in b/tools/libvirt-guests.service.in +index 491ca62138..f0f417bffb 100644 +--- a/tools/libvirt-guests.service.in ++++ b/tools/libvirt-guests.service.in +@@ -10,7 +10,7 @@ Documentation=man:libvirtd(8) + Documentation=https://libvirt.org + + [Service] +-EnvironmentFile=-/etc/sysconfig/libvirt-guests ++EnvironmentFile=-/etc/libvirt/libvirt-guests.conf + # Hack just call traditional service until we factor + # out the code + ExecStart=@libexecdir@/libvirt-guests.sh start +diff --git a/tools/libvirt-guests.sysconf b/tools/libvirt-guests.sysconf +index 669b046507..45b0b9ea46 100644 +--- a/tools/libvirt-guests.sysconf ++++ b/tools/libvirt-guests.sysconf +@@ -1,3 +1,10 @@ ++# ++# Warning: This configuration file is only sourced by the systemd ++# libvirt-guests.service unit. The coresponding openrc facility is in ++# /etc/init.d/libvirtd and /etc/conf.d/libvirtd ++# ++ ++ + # URIs to check for running guests + # example: URIS='default xen:///system vbox+tcp://host/system lxc:///system' + #URIS=default +-- +2.19.2 + |