Logoj0ke.net Open Build Service > Projects > virtualization > virt-manager > virtinst-vif.diff
Sign Up | Log In

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

Currently displaying revision b020225bc6e68798f10e0b1806d45c7c, show latest

x
 
1
diff -Nuar virtinst-0.300.2.orig/virtinst/Guest.py virtinst-0.300.2/virtinst/Guest.py
2
--- virtinst-0.300.2.orig/virtinst/Guest.py 2008-01-10 18:33:32.000000000 -0700
3
+++ virtinst-0.300.2/virtinst/Guest.py  2008-04-01 16:51:11.000000000 -0600
4
@@ -257,6 +257,10 @@
5
         self.type = type
6
         self.bridge = bridge
7
         self.network = network
8
+
9
+        if self.type == "ethernet":
10
+            self.type = "bridge"
11
+
12
         if self.type == "network":
13
             if network is None:
14
                 raise ValueError, _("A network name was not provided")
15
@@ -309,16 +313,23 @@
16
                 print >> sys.stderr, msg
17
                 logging.warning(msg)
18
 
19
-        if not self.bridge and self.type == "bridge":
20
-            self.bridge = util.default_bridge()
21
+        # if not self.bridge and self.type == "bridge":
22
+        #     self.bridge = util.default_bridge()
23
 
24
     def get_xml_config(self):
25
         if self.type == "bridge":
26
-            return ("    <interface type='bridge'>\n" + \
27
-                    "      <source bridge='%(bridge)s'/>\n" + \
28
-                    "      <mac address='%(mac)s'/>\n" + \
29
-                    "    </interface>\n") % \
30
-                    { "bridge": self.bridge, "mac": self.macaddr }
31
+            if self.bridge != None:
32
+                return ("    <interface type='bridge'>\n" + \
33
+                        "      <source bridge='%(bridge)s'/>\n" + \
34
+                        "      <mac address='%(mac)s'/>\n" + \
35
+                        "    </interface>\n") % \
36
+                        { "bridge": self.bridge, "mac": self.macaddr }
37
+            else:
38
+                return ("    <interface type='bridge'>\n" + \
39
+                        "      <mac address='%(mac)s'/>\n" + \
40
+                        "    </interface>\n") % \
41
+                        { "mac": self.macaddr }
42
+
43
         elif self.type == "network":
44
             return ("    <interface type='network'>\n" + \
45
                     "      <source network='%(network)s'/>\n" + \
46