From: Aurelien Jarno <aurelien@aurel32.net>
Date: Sat, 15 Jun 2019 14:13:00 +0000 (+0200)
Subject: Upgrade qemu-system-aarch64-wrapper for ganeti 2.16
X-Git-Url: https://git.adam-barratt.org.uk/?p=mirror%2Fdsa-puppet.git;a=commitdiff_plain;h=3b980449d5163ce69633d8a15c8535715aaa37b0

Upgrade qemu-system-aarch64-wrapper for ganeti 2.16
---

diff --git a/modules/ganeti2/files/qemu-system-aarch64-wrapper b/modules/ganeti2/files/qemu-system-aarch64-wrapper
index 900d6aa64..412d8b3fa 100755
--- a/modules/ganeti2/files/qemu-system-aarch64-wrapper
+++ b/modules/ganeti2/files/qemu-system-aarch64-wrapper
@@ -40,7 +40,7 @@ while [ "$1" ]; do
         *)
             # Replace PCI devices by their bus agnostic variant, and drop
             # all the PCI related options
-            args+=("$(echo $1 | sed -e 's/virtio-\(\w\+\)-pci/virtio-\1-device/' -e 's/,bus=[^,]\+,addr=[^,]\+//')")
+            args+=("$(echo $1 | sed -e 's/virtio-\(\w\+\)-pci/virtio-\1-device/' -e 's/,bus=[^,]\+//' -e 's/,addr=[^,]\+//')")
             ;;
     esac
     shift