Attachment 884971 Details for Bug 1086285 – virt-install-adding-support-for-macvtap-interfaces.patch

[patch] virt-install-adding-support-for-macvtap-interfaces.patch

0001-virt-install-adding-support-for-macvtap-interfaces.patch (text/plain), 1.78 KB, created by Andy Gospodarek on 2014-04-10 14:25:52 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Andy Gospodarek

Created: 2014-04-10 14:25:52 UTC

Size: 1.78 KB

patch

obsolete

>From 813a56315e9daf932f7903e0ff2ca41e460069e0 Mon Sep 17 00:00:00 2001
>From: Andy Gospodarek <gospo@redhat.com>
>Date: Thu, 10 Apr 2014 10:18:38 -0400
>Subject: [PATCH] virt/install: adding support for macvtap interfaces
>
>The --network portion of the guestargs are overwritten by runtest.sh and
>are changed from:
>
>--network type=direct,source=em1,source_mode=bridge,target=macvtap1
>
>to
>
>--network bridge:br3,type=direct,source=em1,source_mode=bridge,target=macvtap1
>
>This syntax is invalid for virt-install *and* there appears to be no way
>to enable macvtap-based interfaces at all when using the beaker virt
>install test.  The modified line above is invalid for virt-install.
>
>This patch checks to see if 'type=direct' is included and does not add
>the optional 'bridge:...' entry to any network arguments.
>---
> virt/install/runtest.sh | 10 +++++++++-
> 1 file changed, 9 insertions(+), 1 deletion(-)
>
>diff --git a/virt/install/runtest.sh b/virt/install/runtest.sh
>index 202fdc2..79b3f05 100755
>--- a/virt/install/runtest.sh
>+++ b/virt/install/runtest.sh
>@@ -1139,8 +1139,16 @@ while read -r guest_recipeid guest_name guest_mac guest_loc guest_ks guest_args
>         NWARG=""
>         for opts in ${GIVENNW}
>         do
>-            NWARG="${NWARG} --network bridge:${brdev},${opts}"
>+            # skip adding brdev when using macvtap syntax:
>+            # --network type=direct,...
>+            DIRECT=$(echo $opts | cut -d\, -f1 | grep 'type=direct')
>+            if [[ -z "${DIRECT}" ]]; then
>+               NWARG="${NWARG} --network bridge:${brdev},${opts}"
>+            else
>+               NWARG="${NWARG} --network ${opts}"
>+            fi
>         done
>+
>         CMDLINE=$(echo ${CMDLINE} | sed -e 's/--extra-args "/--extra-args "ksdevice=eth0 /')
>         CMDLINE="${CMDLINE} --ver6 ${NWARG}"
>         
>-- 
>1.9.0
>

Actions: View | Diff

Attachments on bug 1086285: 884971