[Pkg-libvirt-commits] [SCM] Virtinst Debian packaging branch, master, updated. debian/0.500.0-1
Guido Günther
agx at sigxcpu.org
Wed Jul 29 15:27:38 UTC 2009
The following commit has been merged in the master branch:
commit be8497e422fb61e52cdc5792614a5dfbd9a80926
Author: Guido Günther <agx at sigxcpu.org>
Date: Wed Jul 29 15:57:19 2009 +0200
drop patches applied upstream
0003-allow-to-pass-nic-model.patch
0004-parse-etc-default-console-setup-for-keymap-informati.patch
0005-use-QEMU-s-USB-Tablet-with-Squeeze-guests.patch
0006-add-Ubuntu-Karmic-to-osdict.patch
0007-fix-bridge-names-not-ending-with-digit.patch
0008-Turn-on-ACPI-APIC-for-Windows-except-for-Xen-3.1.0.patch
0009-Add-Windows-7-to-the-osdict.patch
diff --git a/debian/patches/0001-fix-path-to-hvmloader.patch b/debian/patches/0001-fix-path-to-hvmloader.patch
index 0ef2bbc..b201354 100644
--- a/debian/patches/0001-fix-path-to-hvmloader.patch
+++ b/debian/patches/0001-fix-path-to-hvmloader.patch
@@ -8,10 +8,10 @@ Closes: #487682
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/virtinst/FullVirtGuest.py b/virtinst/FullVirtGuest.py
-index 8dc2b0a..0912b0d 100644
+index d88d0dd..556708e 100644
--- a/virtinst/FullVirtGuest.py
+++ b/virtinst/FullVirtGuest.py
-@@ -60,7 +60,7 @@ class FullVirtGuest(Guest):
+@@ -65,7 +65,7 @@ class FullVirtGuest(Guest):
self.emulator = "/usr/lib/xen/bin/qemu-dm"
if (not self.loader) and self.type == "xen":
diff --git a/debian/patches/0002-Fix-path-to-pygrub.patch b/debian/patches/0002-Fix-path-to-pygrub.patch
index 57a3212..9a9332d 100644
--- a/debian/patches/0002-Fix-path-to-pygrub.patch
+++ b/debian/patches/0002-Fix-path-to-pygrub.patch
@@ -7,10 +7,10 @@ Subject: [PATCH] Fix path to pygrub
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/virtinst/util.py b/virtinst/util.py
-index a0cdd0c..17dcc14 100644
+index 808200f..08cf38f 100644
--- a/virtinst/util.py
+++ b/virtinst/util.py
-@@ -431,11 +431,11 @@ def pygrub_path(conn=None):
+@@ -401,11 +401,11 @@ def pygrub_path(conn=None):
if (cap.host.arch == "i86pc"):
return "/usr/lib/xen/bin/pygrub"
else:
diff --git a/debian/patches/0003-allow-to-pass-nic-model.patch b/debian/patches/0003-allow-to-pass-nic-model.patch
deleted file mode 100644
index 30563b6..0000000
--- a/debian/patches/0003-allow-to-pass-nic-model.patch
+++ /dev/null
@@ -1,148 +0,0 @@
-From: =?utf-8?q?Guido=20G=C3=BCnther?= <agx at sigxcpu.org>
-Date: Fri, 8 May 2009 11:57:39 +0200
-Subject: [PATCH] allow to pass nic model
-
----
- man/en/virt-install.pod.in | 13 ++++++++++++-
- virt-image | 4 ++--
- virt-install | 6 +++---
- virtinst/cli.py | 37 ++++++++++++++++++++++++++++++++-----
- 4 files changed, 49 insertions(+), 11 deletions(-)
-
-diff --git a/man/en/virt-install.pod.in b/man/en/virt-install.pod.in
-index 6c5f38d..d908825 100644
---- a/man/en/virt-install.pod.in
-+++ b/man/en/virt-install.pod.in
-@@ -387,7 +387,7 @@ running 'Live CD' images or installing to network storage (iSCSI or NFS root).
-
- =over 2
-
--=item -w NETWORK, --network=NETWORK
-+=item -w NETWORK, --network=NETWORK,opt1=val1,opt2=val2
-
- Connect the guest to the host network. The value for C<NETWORK> can take
- one of 3 formats:
-@@ -423,6 +423,17 @@ that will be used for connectivity. Failing that, the virtual network
- called C<default> will be used. This option can be specified multiple
- times to setup more than one NIC.
-
-+Available options are:
-+
-+=over 4
-+
-+=item model
-+
-+Network device model as seen by the guest. Value can be any nic model supported
-+by the hypervisor, e.g.: 'e1000', 'rtl8139' or 'virtio'.
-+
-+=back
-+
- =item -b BRIDGE, --bridge=BRIDGE
-
- Bridge device to connect the guest NIC to. This parameter is deprecated in
-diff --git a/virt-image b/virt-image
-index a4ab352..18a4a72 100755
---- a/virt-image
-+++ b/virt-image
-@@ -57,8 +57,8 @@ def get_vcpus(vcpus, image_vcpus, check_cpu, guest, conn):
-
- def get_networks(domain, macs, bridges, networks, guest):
- nnics = domain.interface
-- (macs, networks) = cli.digest_networks(guest.conn, macs, bridges,
-- networks, nnics)
-+ (macs, networks, models) = cli.digest_networks(guest.conn, macs, bridges,
-+ networks, nnics)
-
- if len(networks) > nnics:
- print >> sys.stderr, (_("Warning: more networks were provided [%i] then nics required [%i]. All extras are ignored") % (len(networks), nnics))
-diff --git a/virt-install b/virt-install
-index ac4da5b..4675a0d 100755
---- a/virt-install
-+++ b/virt-install
-@@ -254,9 +254,9 @@ def get_networks(macs, bridges, networks, nonetworks, guest):
- if networks:
- fail(_("Cannot use --network with --nonetworks"))
- return
-- (macs, networks) = cli.digest_networks(guest.conn, macs, bridges,
-- networks, nics=1)
-- map(lambda m, n: cli.get_network(m, n, guest), macs, networks)
-+ (macs, networks, models) = cli.digest_networks(guest.conn, macs, bridges,
-+ networks, nics=1)
-+ map(lambda m, n, o: cli.get_network(m, n, guest, o), macs, networks, models)
-
-
-
-diff --git a/virtinst/cli.py b/virtinst/cli.py
-index 12ab73b..2e57b31 100644
---- a/virtinst/cli.py
-+++ b/virtinst/cli.py
-@@ -261,21 +261,46 @@ def get_cpuset(cpuset, mem, guest, conn):
- guest.cpuset = cpustr
- return
-
--def get_network(mac, network, guest):
-+def get_network(mac, network, guest, model=None):
- if mac == "RANDOM":
- mac = None
- if network == "user":
-- n = VirtualNetworkInterface(mac, type="user", conn=guest.conn)
-+ n = VirtualNetworkInterface(mac, type="user",
-+ conn=guest.conn, model=model)
- elif network[0:6] == "bridge":
- n = VirtualNetworkInterface(mac, type="bridge", bridge=network[7:],
-- conn=guest.conn)
-+ conn=guest.conn, model=model)
- elif network[0:7] == "network":
- n = VirtualNetworkInterface(mac, type="network", network=network[8:],
-- conn=guest.conn)
-+ conn=guest.conn, model=model)
- else:
- fail(_("Unknown network type ") + network)
- guest.nics.append(n)
-
-+def parse_network_opts(networks):
-+ nets = []
-+ models = []
-+
-+ for network in networks:
-+ opts = { 'model': None }
-+ args = network.split(",")
-+ nets.append(args[0])
-+
-+ for opt in args[1:]:
-+ opt_type = None
-+ opt_val = None
-+ if opt.count("="):
-+ opt_type, opt_val = opt.split("=", 1)
-+ opts[opt_type.lower()] = opt_val.lower()
-+
-+ for opt_type in opts:
-+ if opt_type == "model":
-+ models.append(opts[opt_type])
-+ else:
-+ fail(_("Unknown '%s' value '%s'") % (opt_type, opt_val))
-+
-+ return (nets, models)
-+
- def digest_networks(conn, macs, bridges, networks, nics = 0):
- def listify(l):
- if l is None:
-@@ -295,6 +320,8 @@ def digest_networks(conn, macs, bridges, networks, nics = 0):
- if bridges:
- networks = map(lambda b: "bridge:" + b, bridges)
-
-+ (networks, models) = parse_network_opts(networks)
-+
- # With just one mac, create a default network if one is not
- # specified.
- if len(macs) == 1 and len(networks) == 0:
-@@ -323,7 +350,7 @@ def digest_networks(conn, macs, bridges, networks, nics = 0):
- networks.append("user")
- macs.append(None)
-
-- return (macs, networks)
-+ return (macs, networks, models)
-
- def get_graphics(vnc, vncport, nographics, sdl, keymap, guest):
- if (vnc and nographics) or \
---
diff --git a/debian/patches/0004-parse-etc-default-console-setup-for-keymap-informati.patch b/debian/patches/0004-parse-etc-default-console-setup-for-keymap-informati.patch
deleted file mode 100644
index 73b1995..0000000
--- a/debian/patches/0004-parse-etc-default-console-setup-for-keymap-informati.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-From: =?utf-8?q?Guido=20G=C3=BCnther?= <agx at sigxcpu.org>
-Date: Thu, 14 May 2009 21:16:53 +0200
-Subject: [PATCH] parse /etc/default/console-setup for keymap information
-
-Closes: #528454
----
- virtinst/util.py | 24 ++++++++++++++++++++++++
- 1 files changed, 24 insertions(+), 0 deletions(-)
-
-diff --git a/virtinst/util.py b/virtinst/util.py
-index 17dcc14..2698b59 100644
---- a/virtinst/util.py
-+++ b/virtinst/util.py
-@@ -43,6 +43,7 @@ from User import User
-
- KEYBOARD_DIR = "/etc/sysconfig/keyboard"
- XORG_CONF = "/etc/X11/xorg.conf"
-+CONSOLE_SETUP_CONF = "/etc/default/console-setup"
-
- def default_route(nic = None):
- if platform.system() == 'SunOS':
-@@ -354,6 +355,27 @@ def _xorg_keymap():
- f.close()
- return kt
-
-+def _console_setup_keymap():
-+ """Look in /etc/default/console-setup for the host machine's keymap, and attempt to
-+ map it to a keymap supported by qemu"""
-+
-+ kt = None
-+ try:
-+ f = open(CONSOLE_SETUP_CONF, "r")
-+ except IOError, e:
-+ logging.debug('Could not open "%s": %s ' % (CONSOLE_SETUP_CONF, str(e)))
-+ else:
-+ keymap_re = re.compile(r'\s*XKBLAYOUT="(?P<kt>[a-z-]+)"')
-+ for line in f:
-+ m = keymap_re.match(line)
-+ if m:
-+ kt = m.group('kt')
-+ break
-+ else:
-+ logging.debug("Didn't find keymap in '%s'!" % XORG_CONF)
-+ f.close()
-+ return kt
-+
- def default_keymap():
- """Look in /etc/sysconfig for the host machine's keymap, and attempt to
- map it to a keymap supported by qemu"""
-@@ -369,6 +391,8 @@ def default_keymap():
- except IOError, e:
- logging.debug('Could not open "/etc/sysconfig/keyboard" ' + str(e))
- kt = _xorg_keymap()
-+ if not kt:
-+ kt = _console_setup_keymap()
- else:
- while 1:
- s = f.readline()
---
diff --git a/debian/patches/0005-use-QEMU-s-USB-Tablet-with-Squeeze-guests.patch b/debian/patches/0005-use-QEMU-s-USB-Tablet-with-Squeeze-guests.patch
deleted file mode 100644
index 496088d..0000000
--- a/debian/patches/0005-use-QEMU-s-USB-Tablet-with-Squeeze-guests.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From: =?utf-8?q?Guido=20G=C3=BCnther?= <agx at sigxcpu.org>
-Date: Fri, 29 May 2009 15:17:02 +0200
-Subject: [PATCH] use QEMU's USB Tablet with Squeeze guests
-
-evdev picks this up as mouse which gives more exact mouse handling
-without the need to grab/ungrab the mouse anymore.
----
- virtinst/osdict.py | 7 +++++++
- 1 files changed, 7 insertions(+), 0 deletions(-)
-
-diff --git a/virtinst/osdict.py b/virtinst/osdict.py
-index 385010f..edccab2 100644
---- a/virtinst/osdict.py
-+++ b/virtinst/osdict.py
-@@ -115,6 +115,13 @@ OS_TYPES = {\
- "disk" : { "bus" : [ (["kvm"], "virtio") ] },
- "net" : { "model" : [ (["kvm"], "virtio") ] }
- }},
-+ "debiansqueeze": { "label": "Debian Squeeze", "distro": "debian",
-+ "devices" : {
-+ "disk" : { "bus" : [ (["kvm"], "virtio") ] },
-+ "net" : { "model" : [ (["kvm"], "virtio") ] },
-+ "input" : { "type" : [ (["all"], "tablet") ],
-+ "bus" : [ (["all"], "usb"), ] },
-+ }},
- "ubuntuhardy": { "label": "Ubuntu 8.04 LTS (Hardy Heron)",
- "distro": "ubuntu",
- "devices" : {
---
diff --git a/debian/patches/0006-add-Ubuntu-Karmic-to-osdict.patch b/debian/patches/0006-add-Ubuntu-Karmic-to-osdict.patch
deleted file mode 100644
index 8c63201..0000000
--- a/debian/patches/0006-add-Ubuntu-Karmic-to-osdict.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From: =?utf-8?q?Guido=20G=C3=BCnther?= <agx at sigxcpu.org>
-Date: Wed, 10 Jun 2009 19:20:35 +0200
-Subject: [PATCH] add Ubuntu Karmic to osdict
-
-Closes: #532531
-Thanks: Christophe Sauthier
----
- virtinst/osdict.py | 6 ++++++
- 1 files changed, 6 insertions(+), 0 deletions(-)
-
-diff --git a/virtinst/osdict.py b/virtinst/osdict.py
-index edccab2..96ce29f 100644
---- a/virtinst/osdict.py
-+++ b/virtinst/osdict.py
-@@ -138,6 +138,12 @@ OS_TYPES = {\
- "net" : { "model" : [ (["kvm"], "virtio") ] },
- "disk" : { "bus" : [ (["kvm"], "virtio") ] }
- }},
-+ "ubuntukarmic": { "label": "Ubuntu 9.10 (Karmic Koala)",
-+ "distro": "ubuntu",
-+ "devices" : {
-+ "net" : { "model" : [ (["kvm"], "virtio") ] },
-+ "disk" : { "bus" : [ (["kvm"], "virtio") ] }
-+ }},
- "generic24": { "label": "Generic 2.4.x kernel" },
- "generic26": { "label": "Generic 2.6.x kernel" },
- "virtio26": { "sortby": "genericvirtio26",
---
diff --git a/debian/patches/0007-fix-bridge-names-not-ending-with-digit.patch b/debian/patches/0007-fix-bridge-names-not-ending-with-digit.patch
deleted file mode 100644
index 34a8f5e..0000000
--- a/debian/patches/0007-fix-bridge-names-not-ending-with-digit.patch
+++ /dev/null
@@ -1,183 +0,0 @@
-From: =?utf-8?q?Guido=20G=C3=BCnther?= <agx at sigxcpu.org>
-Date: Sun, 21 Jun 2009 19:06:15 +0200
-Subject: [PATCH] fix bridge names not ending with digit
-
-Pulled from upstream:
-http://hg.et.redhat.com/cgi-bin/hg-virt.cgi/applications/virtinst--devel/rev/503cd42936a9
-
-Closes: #533539
-Thanks: Cole Robinso for the fix and Andreas Unterkircher for testing
----
- virtinst/VirtualNetworkInterface.py | 2 +-
- virtinst/_util.py | 50 +++++++++++++++++++++++++++++-
- virtinst/util.py | 58 +++++++---------------------------
- 3 files changed, 62 insertions(+), 48 deletions(-)
-
-diff --git a/virtinst/VirtualNetworkInterface.py b/virtinst/VirtualNetworkInterface.py
-index 0e77519..6f3c3c4 100644
---- a/virtinst/VirtualNetworkInterface.py
-+++ b/virtinst/VirtualNetworkInterface.py
-@@ -127,7 +127,7 @@ class VirtualNetworkInterface(VirtualDevice.VirtualDevice):
- raise RuntimeError(msg)
-
- if not self.bridge and self.type == "bridge":
-- self.bridge = _util.default_bridge()
-+ self.bridge = _util.default_bridge2(self.conn)
-
- def get_xml_config(self):
- src_xml = ""
-diff --git a/virtinst/_util.py b/virtinst/_util.py
-index ff5bc91..5169971 100644
---- a/virtinst/_util.py
-+++ b/virtinst/_util.py
-@@ -28,10 +28,12 @@ import os
- import re
- import commands
- import logging
-+import platform
-+import subprocess
-
- import libvirt
-
--from virtinst import util
-+import virtinst.util as util
- from virtinst import _virtinst as _
-
- def is_vdisk(path):
-@@ -176,6 +178,52 @@ def fetch_all_guests(conn):
- return (active, inactive)
-
-
-+def default_nic():
-+ """
-+ Return the default NIC to use, if one is specified.
-+ """
-+
-+ dev = ''
-+
-+ if platform.system() != 'SunOS':
-+ return dev
-+
-+ # XXX: fails without PRIV_XVM_CONTROL
-+ proc = subprocess.Popen(['/usr/lib/xen/bin/xenstore-read',
-+ 'device-misc/vif/default-nic'], stdout=subprocess.PIPE,
-+ stderr=subprocess.PIPE)
-+ out = proc.stdout.readlines()
-+ if len(out) > 0:
-+ dev = out[0].rstrip()
-+
-+ return dev
-+
-+def default_bridge2(conn = None):
-+ if platform.system() == 'SunOS':
-+ return ["bridge", default_nic()]
-+
-+ dev = util.default_route()
-+
-+ if (dev is not None and
-+ (not conn or not is_uri_remote(conn.getURI()))):
-+ # New style peth0 == phys dev, eth0 == bridge, eth0 == default route
-+ if os.path.exists("/sys/class/net/%s/bridge" % dev):
-+ return ["bridge", dev]
-+
-+ # Old style, peth0 == phys dev, eth0 == netloop, xenbr0 == bridge,
-+ # vif0.0 == netloop enslaved, eth0 == default route
-+ try:
-+ defn = int(dev[-1])
-+ except:
-+ defn = -1
-+
-+ if (defn >= 0 and
-+ os.path.exists("/sys/class/net/peth%d/brport" % defn) and
-+ os.path.exists("/sys/class/net/xenbr%d/bridge" % defn)):
-+ return ["bridge", "xenbr%d" % defn]
-+
-+ return None
-+
- #
- # These functions accidentally ended up in the API under virtinst.util
- #
-diff --git a/virtinst/util.py b/virtinst/util.py
-index 2698b59..6308e5b 100644
---- a/virtinst/util.py
-+++ b/virtinst/util.py
-@@ -38,6 +38,7 @@ from sys import stderr
-
- import libvirt
- from virtinst import _virtinst as _
-+import virtinst
- import CapabilitiesParser
- from User import User
-
-@@ -76,59 +77,24 @@ def default_route(nic = None):
- continue
- return None
-
--def _default_nic():
-- """Return the default NIC to use, if one is specified.
-- This is NOT part of the API and may change at will."""
--
-- dev = ''
--
-- if platform.system() != 'SunOS':
-- return dev
--
-- # XXX: fails without PRIV_XVM_CONTROL
-- proc = subprocess.Popen(['/usr/lib/xen/bin/xenstore-read',
-- 'device-misc/vif/default-nic'], stdout=subprocess.PIPE,
-- stderr=subprocess.PIPE)
-- out = proc.stdout.readlines()
-- if len(out) > 0:
-- dev = out[0].rstrip()
--
-- return dev
-
- def default_bridge():
-- if platform.system() == 'SunOS':
-- return _default_nic()
--
-- rt = default_route()
-- if rt is None:
-- defn = None
-+ ret = virtinst._util.default_bridge2(None)
-+ if not ret:
-+ # Maintain this behavior for back compat
-+ ret = "xenbr0"
- else:
-- defn = int(rt[-1])
-+ ret = ret[1]
-
-- if defn is None:
-- return "xenbr0"
-- else:
-- return "xenbr%d"%(defn)
-+ return ret
-
- def default_network(conn):
-- if platform.system() == 'SunOS':
-- return ["bridge", _default_nic()]
--
-- dev = default_route()
--
-- if dev is not None and not is_uri_remote(conn.getURI()):
-- # New style peth0 == phys dev, eth0 == bridge, eth0 == default route
-- if os.path.exists("/sys/class/net/%s/bridge" % dev):
-- return ["bridge", dev]
--
-- # Old style, peth0 == phys dev, eth0 == netloop, xenbr0 == bridge,
-- # vif0.0 == netloop enslaved, eth0 == default route
-- defn = int(dev[-1])
-- if os.path.exists("/sys/class/net/peth%d/brport" % defn) and \
-- os.path.exists("/sys/class/net/xenbr%d/bridge" % defn):
-- return ["bridge", "xenbr%d" % defn]
-+ ret = virtinst._util.default_bridge2(conn)
-+ if not ret:
-+ # FIXME: Check that this exists
-+ ret = ["network", "default"]
-
-- return ["network", "default"]
-+ return ret
-
- def default_connection():
- if os.path.exists('/var/lib/xend'):
---
diff --git a/debian/patches/0008-Turn-on-ACPI-APIC-for-Windows-except-for-Xen-3.1.0.patch b/debian/patches/0008-Turn-on-ACPI-APIC-for-Windows-except-for-Xen-3.1.0.patch
deleted file mode 100644
index c129b80..0000000
--- a/debian/patches/0008-Turn-on-ACPI-APIC-for-Windows-except-for-Xen-3.1.0.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From: =?utf-8?q?Laurent=20L=C3=A9onard?= <laurent at open-minds.org>
-Date: Thu, 16 Jul 2009 21:21:46 +0200
-Subject: [PATCH] Turn on ACPI/APIC for Windows, except for Xen < 3.1.0.
-
-Pulled from upstream:
-http://hg.et.redhat.com/cgi-bin/hg-virt.cgi/applications/virtinst--devel/rev/3c68ba7758a6
-
-Closes: #533201
-Thanks: Cole Robinson
----
- virtinst/osdict.py | 10 ++++++++--
- 1 files changed, 8 insertions(+), 2 deletions(-)
-
-diff --git a/virtinst/osdict.py b/virtinst/osdict.py
-index 96ce29f..9347314 100644
---- a/virtinst/osdict.py
-+++ b/virtinst/osdict.py
-@@ -166,10 +166,16 @@ OS_TYPES = {\
- },
- "variants": { \
- "winxp":{ "label": "Microsoft Windows XP (x86)",
-- "acpi": False, "apic": False },
-+ "acpi": [ ("xen", 3001000, False),
-+ ("all", True ), ],
-+ "apic": [ ("xen", 3001000, False),
-+ ("all", True ), ], },
- "winxp64":{ "label": "Microsoft Windows XP (x86_64)" },
- "win2k": { "label": "Microsoft Windows 2000",
-- "acpi": False, "apic": False },
-+ "acpi": [ ("xen", 3001000, False),
-+ ("all", True ), ],
-+ "apic": [ ("xen", 3001000, False),
-+ ("all", True ), ], },
- "win2k3": { "label": "Microsoft Windows 2003" },
- "win2k8": { "label": "Microsoft Windows 2008" },
- "vista": { "label": "Microsoft Windows Vista" },
---
diff --git a/debian/patches/0009-Add-Windows-7-to-the-osdict.patch b/debian/patches/0009-Add-Windows-7-to-the-osdict.patch
deleted file mode 100644
index 9ef84f2..0000000
--- a/debian/patches/0009-Add-Windows-7-to-the-osdict.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From: =?utf-8?q?Laurent=20L=C3=A9onard?= <laurent at open-minds.org>
-Date: Thu, 16 Jul 2009 23:54:04 +0200
-Subject: [PATCH] Add Windows 7 to the osdict.
-
-Closes: #535781
----
- virtinst/osdict.py | 1 +
- 1 files changed, 1 insertions(+), 0 deletions(-)
-
-diff --git a/virtinst/osdict.py b/virtinst/osdict.py
-index 9347314..84ea9c8 100644
---- a/virtinst/osdict.py
-+++ b/virtinst/osdict.py
-@@ -179,6 +179,7 @@ OS_TYPES = {\
- "win2k3": { "label": "Microsoft Windows 2003" },
- "win2k8": { "label": "Microsoft Windows 2008" },
- "vista": { "label": "Microsoft Windows Vista" },
-+ "win7": { "label": "Microsoft Windows 7" }
- },
- },
-
---
diff --git a/debian/patches/series b/debian/patches/series
index fa4a712..c258871 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,9 +1,2 @@
0001-fix-path-to-hvmloader.patch
0002-Fix-path-to-pygrub.patch
-0003-allow-to-pass-nic-model.patch
-0004-parse-etc-default-console-setup-for-keymap-informati.patch
-0005-use-QEMU-s-USB-Tablet-with-Squeeze-guests.patch
-0006-add-Ubuntu-Karmic-to-osdict.patch
-0007-fix-bridge-names-not-ending-with-digit.patch
-0008-Turn-on-ACPI-APIC-for-Windows-except-for-Xen-3.1.0.patch
-0009-Add-Windows-7-to-the-osdict.patch
--
Virtinst Debian packaging
More information about the Pkg-libvirt-commits
mailing list