commit: d49be3cdca529511f81110a56c428045620fc46a
Author: Matthias Maier <tamiko <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 3 17:59:12 2015 +0000
Commit: Matthias Maier <tamiko <AT> gentoo <DOT> org>
CommitDate: Sat Oct 3 18:16:12 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d49be3cd
app-emulation/libvirt: Avoid bashism in runscript, bug 561386
Thanks to Lars Wendler and Alexander Tsoy.
Gentoo-Bug: 561386
Package-Manager: portage-2.2.22
.../libvirt/files/{libvirt-guests.init => libvirt-guests.init-r1} | 8 ++------
.../libvirt/{libvirt-1.2.19.ebuild => libvirt-1.2.19-r1.ebuild} | 2 +-
2 files changed, 3 insertions(+), 7 deletions(-)
diff --git a/app-emulation/libvirt/files/libvirt-guests.init
b/app-emulation/libvirt/files/libvirt-guests.init-r1
similarity index 97%
rename from app-emulation/libvirt/files/libvirt-guests.init
rename to app-emulation/libvirt/files/libvirt-guests.init-r1
index c38a0f0..a8d65f8 100644
--- a/app-emulation/libvirt/files/libvirt-guests.init
+++ b/app-emulation/libvirt/files/libvirt-guests.init-r1
@@ -184,10 +184,8 @@ start() {
# start networks
ebegin "Starting libvirt networks"
- while read -r line
+ while read -r uri uuid
do
- # tokenize the data
- read -r uri uuid <<<"${line}"
# ignore trash
[ -z "${uri}" ] || [ -z "${uuid}" ] && continue
@@ -199,10 +197,8 @@ start() {
# start domains
ebegin "Starting libvirt domains"
- while read -r line
+ while read -r uri uuid
do
- # tokenize the data
- read -r uri uuid <<<"${line}"
# ignore trash
[ -z "${uri}" ] || [ -z "${uuid}" ] && continue
diff --git a/app-emulation/libvirt/libvirt-1.2.19.ebuild
b/app-emulation/libvirt/libvirt-1.2.19-r1.ebuild
similarity index 99%
rename from app-emulation/libvirt/libvirt-1.2.19.ebuild
rename to app-emulation/libvirt/libvirt-1.2.19-r1.ebuild
index 55fb80d..e6029ed 100644
--- a/app-emulation/libvirt/libvirt-1.2.19.ebuild
+++ b/app-emulation/libvirt/libvirt-1.2.19-r1.ebuild
@@ -450,7 +450,7 @@ src_install() {
systemd_newtmpfilesd "${FILESDIR}"/libvirtd.tmpfiles.conf libvirtd.conf
newinitd "${S}/libvirtd.init" libvirtd || die
- newinitd "${FILESDIR}/libvirt-guests.init" libvirt-guests || die
+ newinitd "${FILESDIR}/libvirt-guests.init-r1" libvirt-guests || die
newinitd "${FILESDIR}/virtlockd.init-r1" virtlockd || die
newconfd "${FILESDIR}/libvirtd.confd-r5" libvirtd || die
