Attachment 6310 Details for Bug 33694

[patch] Setup empty bridge

33694-UVMM-Setup-empty-bridge.patch (text/plain), 3.44 KB, created by Philipp Hahn on 2014-11-05 21:11 CET

(hide)

Description:

Filename:

MIME Type:

Creator: Philipp Hahn

Created: 2014-11-05 21:11 CET

Size: 3.44 KB

patch

obsolete

>From c4356aee353af9301fb7f766e90511712a74c32e Mon Sep 17 00:00:00 2001
>Message-Id: <c4356aee353af9301fb7f766e90511712a74c32e.1415218223.git.hahn@univention.de>
>From: Philipp Hahn <hahn@univention.de>
>Date: Wed, 5 Nov 2014 21:09:24 +0100
>Subject: [PATCH] Bug #33694 UVMM: Setup empty bridge
>Organization: Univention GmbH, Bremen, Germany
>
>Setup an empty network bridge "br0" for virtualization.
>---
> .../debian/changelog                               |  6 ++++
> ...ntion-virtual-machine-manager-node-kvm.postinst | 32 ++++++++++++++++++----
> 2 files changed, 33 insertions(+), 5 deletions(-)
>
>diff --git a/branches/ucs-4.0/ucs-4.0-0/virtualization/univention-virtual-machine-manager-node/debian/changelog b/branches/ucs-4.0/ucs-4.0-0/virtualization/univention-virtual-machine-manager-node/debian/changelog
>index 1e497e2..0dcf5ca 100644
>--- a/branches/ucs-4.0/ucs-4.0-0/virtualization/univention-virtual-machine-manager-node/debian/changelog
>+++ b/branches/ucs-4.0/ucs-4.0-0/virtualization/univention-virtual-machine-manager-node/debian/changelog
>@@ -1,3 +1,9 @@
>+univention-virtual-machine-manager-node (3.0.3-1) unstable; urgency=low
>+
>+  * Bug #33694: Setup empty bridge
>+
>+ -- Philipp Hahn <hahn@univention.de>  Wed, 05 Nov 2014 20:50:23 +0100
>+
> univention-virtual-machine-manager-node (3.0.2-3) unstable; urgency=low
> 
>   * Bug #33694: Adapt bridge transfer to ifupdown change
>diff --git a/branches/ucs-4.0/ucs-4.0-0/virtualization/univention-virtual-machine-manager-node/debian/univention-virtual-machine-manager-node-kvm.postinst b/branches/ucs-4.0/ucs-4.0-0/virtualization/univention-virtual-machine-manager-node/debian/univention-virtual-machine-manager-node-kvm.postinst
>index 9620342..675deb2 100644
>--- a/branches/ucs-4.0/ucs-4.0-0/virtualization/univention-virtual-machine-manager-node/debian/univention-virtual-machine-manager-node-kvm.postinst
>+++ b/branches/ucs-4.0/ucs-4.0-0/virtualization/univention-virtual-machine-manager-node/debian/univention-virtual-machine-manager-node-kvm.postinst
>@@ -38,11 +38,33 @@ univention-config-registry set uvmm/kvm/bridge/autostart?no \
> 	uvmm/libvirt/action/shutdown?suspend
> 
> # Bug #33006: incompatible with bridge configuration through UMC
>-case "$(univention-config-registry get uvmm/kvm/bridge/autostart)" in
>-false|no) ;;
>-manually) ;;
>-*) univention-config-registry set umc/modules/setup/network/disabled/by=kvm ;;
>-esac
>+setup_bridge () {
>+	local BRIDGE='br0'
>+	# Only after succeddful installation
>+	[ "$1" = configure ] || return 0
>+	# Not when old script is used
>+	case "$(univention-config-registry get uvmm/kvm/bridge/autostart)" in
>+	false|no) ;;
>+	manually) ;;
>+	*) univention-config-registry set umc/modules/setup/network/disabled/by=kvm ; return 0 ;;
>+	esac
>+	# Only once after upgrade from UCS-3 or for new installation
>+	dpkg --compare-versions "$2" lt 3.0.3 || return 0
>+	# Not when br0 is already configured
>+	[ -n "$(ucr --keys-only search --brief --non-empty "^interfaces/${BRIDGE}/")" ] && return 0
>+	# Not when any other bridge is configured
>+	ucr search --brief --non-empty '^interfaces/[^/]+/options/[0-9]+$' |
>+		grep -q '^interfaces/[^/]+/options/[0-9]+: bridge_ports ' && return 0
>+
>+	xargs -d '\n' ucr set <<__UCR__
>+interfaces/${BRIDGE}/type=manual
>+interfaces/${BRIDGE}/start=yes
>+interfaces/${BRIDGE}/options/0=bridge_fd 0
>+interfaces/${BRIDGE}/options/1=bridge_ports none
>+__UCR__
>+	ifup "$BRIDGE"
>+}
>+setup_bridge "$@"
> 
> if [ "$server_role" = "domaincontroller_master" -o "$server_role" = "domaincontroller_backup" ]
> then
>-- 
>1.9.1
>

Actions: View | Diff

Attachments on bug 33694: 6310