From f5c9966ae26931d258ce571060e64bf75c0df115 Mon Sep 17 00:00:00 2001 From: Brian Harring Date: Thu, 23 Aug 2012 21:18:06 -0700 Subject: Pull in a fix from rafaelmartins for dealing w/ multiple qtaps. Uprev the version in the process. --- .../qemu-init-scripts/files/qtap-manipulate | 4 +--- .../qemu-init-scripts/qemu-init-scripts-0.1.ebuild | 23 ---------------------- .../qemu-init-scripts/qemu-init-scripts-0.2.ebuild | 23 ++++++++++++++++++++++ 3 files changed, 24 insertions(+), 26 deletions(-) delete mode 100644 app-emulation/qemu-init-scripts/qemu-init-scripts-0.1.ebuild create mode 100644 app-emulation/qemu-init-scripts/qemu-init-scripts-0.2.ebuild diff --git a/app-emulation/qemu-init-scripts/files/qtap-manipulate b/app-emulation/qemu-init-scripts/files/qtap-manipulate index 426bc78..41ab0ca 100644 --- a/app-emulation/qemu-init-scripts/files/qtap-manipulate +++ b/app-emulation/qemu-init-scripts/files/qtap-manipulate @@ -12,9 +12,7 @@ has() { } find_available_node() { - local val=$(ifconfig -a | grep -i ^qtap | cut -d ' ' -f1) - # Strip off ifconfig appended ':' - val="${val%:}" + local val=$(ifconfig -a | grep -i ^qtap | cut -d: -f1) local pos=0 while has qtap${pos} $val; do pos=$(( $pos + 1 )) diff --git a/app-emulation/qemu-init-scripts/qemu-init-scripts-0.1.ebuild b/app-emulation/qemu-init-scripts/qemu-init-scripts-0.1.ebuild deleted file mode 100644 index c3b2b60..0000000 --- a/app-emulation/qemu-init-scripts/qemu-init-scripts-0.1.ebuild +++ /dev/null @@ -1,23 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EGIT_REPO_URI="git://git.overlays.gentoo.org/proj/kvm-tools.git" -inherit git-2 - -DESCRIPTION="Kvm and qemu init scripts" -SRC_URI='' -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 x86" - -RPDEPEND=" - || ( app-emulation/qemu-kvm app-emulation/qemu ) - || ( net-misc/socat net-analyzer/netcat6 )" - " - -src_install() { - newinitd "${FILESDIR}"/qemu-init-script qemu - newconfd "${FILESDIR}"/qemu-conf.example qemu.conf.example - newsbin "${FILESDIR}"/qtap-manipulate qtap-manipulate - dosym qemu /etc/init.d/kvm -} diff --git a/app-emulation/qemu-init-scripts/qemu-init-scripts-0.2.ebuild b/app-emulation/qemu-init-scripts/qemu-init-scripts-0.2.ebuild new file mode 100644 index 0000000..c3b2b60 --- /dev/null +++ b/app-emulation/qemu-init-scripts/qemu-init-scripts-0.2.ebuild @@ -0,0 +1,23 @@ +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EGIT_REPO_URI="git://git.overlays.gentoo.org/proj/kvm-tools.git" +inherit git-2 + +DESCRIPTION="Kvm and qemu init scripts" +SRC_URI='' +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="amd64 x86" + +RPDEPEND=" + || ( app-emulation/qemu-kvm app-emulation/qemu ) + || ( net-misc/socat net-analyzer/netcat6 )" + " + +src_install() { + newinitd "${FILESDIR}"/qemu-init-script qemu + newconfd "${FILESDIR}"/qemu-conf.example qemu.conf.example + newsbin "${FILESDIR}"/qtap-manipulate qtap-manipulate + dosym qemu /etc/init.d/kvm +} -- cgit v1.2.3-65-gdbad