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

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 c38a0f005a9f3ed7c2e77dfb387a96215a709aa4..a8d65f894bab63c59d9e0d3b7dab931e4d39118f 100644 (file)
--- 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 55fb80d799339085bc559655166cbef7b551cb35..e6029ed9a2284a2b5dd83d8820a5974a16ca2345 100644 (file)
--- 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