diff options
author | Matthias Maier <tamiko@gentoo.org> | 2015-08-19 20:07:43 -0500 |
---|---|---|
committer | Matthias Maier <tamiko@gentoo.org> | 2015-08-19 20:13:32 -0500 |
commit | 75a2af9e00d8701cb3a6f201976ed9ba27bcc7d0 (patch) | |
tree | 149b6431a0c065d9b834d116a9561cb87a1bd064 /app-emulation/libvirt/libvirt-9999.ebuild | |
parent | app-emulation/libvirt: break apart OpenRC init script (diff) | |
download | gentoo-75a2af9e00d8701cb3a6f201976ed9ba27bcc7d0.tar.gz gentoo-75a2af9e00d8701cb3a6f201976ed9ba27bcc7d0.tar.bz2 gentoo-75a2af9e00d8701cb3a6f201976ed9ba27bcc7d0.zip |
app-emulation/libvirt: Update init scripts for 1.2.18-r2 and 9999
update init scripts for 1.2.18-r2 und 9999. Drop keywords for testing due
to major runscript change.
Bugs: 551854
Bugs: 555736
Bugs: 558034
Package-Manager: portage-2.2.20.1
Diffstat (limited to 'app-emulation/libvirt/libvirt-9999.ebuild')
-rw-r--r-- | app-emulation/libvirt/libvirt-9999.ebuild | 27 |
1 files changed, 19 insertions, 8 deletions
diff --git a/app-emulation/libvirt/libvirt-9999.ebuild b/app-emulation/libvirt/libvirt-9999.ebuild index 783647ae937a..ce8d65bdcd43 100644 --- a/app-emulation/libvirt/libvirt-9999.ebuild +++ b/app-emulation/libvirt/libvirt-9999.ebuild @@ -122,7 +122,14 @@ DEPEND="${RDEPEND} # gentoo.readme stuff: DISABLE_AUTOFORMATTING=true -DOC_CONTENTS="For the basic networking support (bridged and routed networks) you don't +DOC_CONTENTS="Important: The openrc libvirtd init script is now broken up into two +separate services: libvirtd, that solely handles the daemon, and +libvirt-guests, that takes care of clients during shutdown/restart of the +host. In order to reenable client handling, edit /etc/conf.d/libvirt-guests +and enable the service: + $ rc-update add libvirt-guests + +For the basic networking support (bridged and routed networks) you don't need any extra software. For more complex network modes including but not limited to NATed network, you can enable the 'virt-network' USE flag. @@ -137,9 +144,10 @@ For openrc users: Please use /etc/conf.d/libvirtd to control the '--listen' parameter for libvirtd. - The default configuration will suspend and resume running kvm guests - with 'managedsave'. This behavior can be changed under - /etc/conf.d/libvirtd + Use /etc/init.d/libvirt-guests to manage clients on restart/shutdown of + the host. The default configuration will suspend and resume running kvm + guests with 'managedsave'. This behavior can be changed under + /etc/conf.d/libvirt-guests For systemd users: @@ -259,7 +267,7 @@ src_prepare() { epatch \ "${FILESDIR}"/${PN}-1.2.9-do_not_use_sysconf.patch \ "${FILESDIR}"/${PN}-1.2.16-fix_paths_in_libvirt-guests_sh.patch \ - "${FILESDIR}"/${P}-fix_paths_for_apparmor.patch + "${FILESDIR}"/${PN}-1.2.17-fix_paths_for_apparmor.patch [[ -n ${BACKPORTS} ]] && \ EPATCH_FORCE=yes EPATCH_SUFFIX="patch" \ @@ -274,7 +282,7 @@ src_prepare() { local iscsi_init= local rbd_init= local firewalld_init= - cp "${FILESDIR}/libvirtd.init-r14" "${S}/libvirtd.init" + cp "${FILESDIR}/libvirtd.init-r15" "${S}/libvirtd.init" use avahi && avahi_init='avahi-daemon' use iscsi && iscsi_init='iscsid' use rbd && rbd_init='ceph' @@ -441,9 +449,12 @@ src_install() { systemd_newtmpfilesd "${FILESDIR}"/libvirtd.tmpfiles.conf libvirtd.conf newinitd "${S}/libvirtd.init" libvirtd || die - newconfd "${FILESDIR}/libvirtd.confd-r4" libvirtd || die + newinitd "${FILESDIR}/libvirt-guests.initd" libvirt-guests || die newinitd "${FILESDIR}/virtlockd.init-r1" virtlockd || die + newconfd "${FILESDIR}/libvirtd.confd-r5" libvirtd || die + newconfd "${FILESDIR}/libvirt-guests.confd" libvirt-guests || die + readme.gentoo_create_doc } @@ -472,7 +483,7 @@ pkg_postinst() { use libvirtd || return 0 # From here, only libvirtd-related instructions, be warned! - if [[ -n ${REPLACING_VERSIONS} ]] && ! version_is_at_least 1.2.17-r2 ${REPLACING_VERSIONS} ]]; then + if [[ -n ${REPLACING_VERSIONS} ]] && ! version_is_at_least 1.2.18-r2 ${REPLACING_VERSIONS} ]]; then FORCE_PRINT_ELOG=true fi |