[PATCH master 2/2] Use configure-provided value for the default bridge

['Klaus Aehlig' via ganeti-devel]

...instead of hard-coding the value "xen-br0".

Signed-off-by: Klaus Aehlig <aeh...@google.com>
---
 Makefile.am             | 1 +
 src/AutoConf.hs.in      | 3 +++
 src/Ganeti/Constants.hs | 2 +-
 3 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/Makefile.am b/Makefile.am
index 767ff47..0b8aafe 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -2070,6 +2070,7 @@ src/AutoConf.hs: Makefile src/AutoConf.hs.in 
$(PRINT_PY_CONSTANTS) \
            -DKVM_KERNEL="$(KVM_KERNEL)" \
            -DSHARED_FILE_STORAGE_DIR="$(SHARED_FILE_STORAGE_DIR)" \
            -DIALLOCATOR_SEARCH_PATH="\"$(IALLOCATOR_SEARCH_PATH)\"" \
+           -DDEFAULT_BRIDGE="$(DEFAULT_BRIDGE)" \
            -DKVM_PATH="$(KVM_PATH)" \
            -DIP_PATH="$(IP_PATH)" \
            -DSOCAT_PATH="$(SOCAT)" \
diff --git a/src/AutoConf.hs.in b/src/AutoConf.hs.in
index a59b51c..1a47972 100644
--- a/src/AutoConf.hs.in
+++ b/src/AutoConf.hs.in
@@ -103,6 +103,9 @@ sharedFileStorageDir = "SHARED_FILE_STORAGE_DIR"
 iallocatorSearchPath :: [String]
 iallocatorSearchPath = split IALLOCATOR_SEARCH_PATH
 
+defaultBridge :: String
+defaultBridge = "DEFAULT_BRIDGE"
+
 kvmPath :: String
 kvmPath = "KVM_PATH"
 
diff --git a/src/Ganeti/Constants.hs b/src/Ganeti/Constants.hs
index 6bc1b9f..6fa5f62 100644
--- a/src/Ganeti/Constants.hs
+++ b/src/Ganeti/Constants.hs
@@ -1234,7 +1234,7 @@ maxTagsPerObj = 4096
 -- * Others
 
 defaultBridge :: String
-defaultBridge = "xen-br0"
+defaultBridge = AutoConf.defaultBridge
 
 defaultOvs :: String
 defaultOvs = "switch1"
-- 
2.1.0.rc2.206.gedb03e5