File virtinst-vif.diff of Package virt-manager

File virtinst-vif.diff of Package virt-manager (Revision b6fedbfe7e17444428628412586e2617)

Currently displaying revision b6fedbfe7e17444428628412586e2617, show latest

diff -Nuar virtinst-0.300.2.orig/virtinst/Guest.py virtinst-0.300.2/virtinst/Guest.py
--- virtinst-0.300.2.orig/virtinst/Guest.py	2008-01-10 18:33:32.000000000 -0700
+++ virtinst-0.300.2/virtinst/Guest.py	2008-04-01 16:51:11.000000000 -0600
@@ -257,6 +257,10 @@
         self.type = type
         self.bridge = bridge
         self.network = network
+
+        if self.type == "ethernet":
+            self.type = "bridge"
+
         if self.type == "network":
             if network is None:
                 raise ValueError, _("A network name was not provided")
@@ -309,16 +313,23 @@
                 print >> sys.stderr, msg
                 logging.warning(msg)
 
-        if not self.bridge and self.type == "bridge":
-            self.bridge = util.default_bridge()
+        # if not self.bridge and self.type == "bridge":
+        #     self.bridge = util.default_bridge()
 
     def get_xml_config(self):
         if self.type == "bridge":
-            return ("    <interface type='bridge'>\n" + \
-                    "      <source bridge='%(bridge)s'/>\n" + \
-                    "      <mac address='%(mac)s'/>\n" + \
-                    "    </interface>\n") % \
-                    { "bridge": self.bridge, "mac": self.macaddr }
+            if self.bridge != None:
+                return ("    <interface type='bridge'>\n" + \
+                        "      <source bridge='%(bridge)s'/>\n" + \
+                        "      <mac address='%(mac)s'/>\n" + \
+                        "    </interface>\n") % \
+                        { "bridge": self.bridge, "mac": self.macaddr }
+            else:
+                return ("    <interface type='bridge'>\n" + \
+                        "      <mac address='%(mac)s'/>\n" + \
+                        "    </interface>\n") % \
+                        { "mac": self.macaddr }
+
         elif self.type == "network":
             return ("    <interface type='network'>\n" + \
                     "      <source network='%(network)s'/>\n" + \