[Pkg-libvirt-commits] [SCM] Virt Installer packaging branch, master, updated. debian/0.400.0-7-5-g7170775
Guido Günther
agx at sigxcpu.org
Thu Jan 29 16:12:07 UTC 2009
The following commit has been merged in the master branch:
commit d18654d2bd0def2b59925a87c01cda8bf91147c2
Author: Guido Günther <agx at sigxcpu.org>
Date: Thu Jan 29 16:37:43 2009 +0100
drop patches
* fixed upstream:
0004-virt-convert-Fix-crash-caused-by-accessing-now-priv.patch
0005-Explicitly-set-FullVirtGuest-arch-to-equal-host-arch.patch
* applied upstream:
0006-scratchdir-for-uid-0.patch
0007-create-scratchdir-if-it-doesn-t-exist.patch
0008-use-virtio-for-Lenny-guests.patch
0009-Add-support-for-Debian-Xen-paravirt-installs.patch
0010-look-for-keymap-in-xorg.conf-too.patch
diff --git a/debian/patches/0004-virt-convert-Fix-crash-caused-by-accessing-now-priv.patch b/debian/patches/0004-virt-convert-Fix-crash-caused-by-accessing-now-priv.patch
deleted file mode 100644
index fc29677..0000000
--- a/debian/patches/0004-virt-convert-Fix-crash-caused-by-accessing-now-priv.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From adcb6852b9959c8818c779f50c60f19888085a15 Mon Sep 17 00:00:00 2001
-From: Cole Robinson <crobinso at redhat.com>
-Date: Thu, 18 Sep 2008 14:43:56 +0200
-Subject: [PATCH] virt-convert: Fix crash caused by accessing now private os dictionary
-
-Upstream HG 1021d9c89a740b034d20e61bf4f24b68b5ef375f
----
- virtconv/parsers/virtimage.py | 4 +++-
- 1 files changed, 3 insertions(+), 1 deletions(-)
-
-diff --git a/virtconv/parsers/virtimage.py b/virtconv/parsers/virtimage.py
-index 260b294..5fa99fa 100644
---- a/virtconv/parsers/virtimage.py
-+++ b/virtconv/parsers/virtimage.py
-@@ -83,7 +83,9 @@ def export_os_params(vm):
- ostype = None
- osvariant = None
-
-- ostype = fv.OS_TYPES.get(vm.os_type)
-+ # TODO: Shouldn't be directly using _OS_TYPES here. virt-image libs (
-+ # ImageParser?) should handle this info
-+ ostype = fv._OS_TYPES.get(vm.os_type)
- if ostype:
- osvariant = ostype.variants.get(vm.os_variant)
-
---
-1.5.6.5
-
diff --git a/debian/patches/0005-Explicitly-set-FullVirtGuest-arch-to-equal-host-arch.patch b/debian/patches/0005-Explicitly-set-FullVirtGuest-arch-to-equal-host-arch.patch
deleted file mode 100644
index 4bdc72e..0000000
--- a/debian/patches/0005-Explicitly-set-FullVirtGuest-arch-to-equal-host-arch.patch
+++ /dev/null
@@ -1,113 +0,0 @@
-From ce9db208775bbeca17e750b54168978742be54a1 Mon Sep 17 00:00:00 2001
-From: Cole Robinson <crobinso at redhat.com>
-Date: Thu, 18 Sep 2008 14:46:16 +0200
-Subject: [PATCH] Explicitly set FullVirtGuest arch to equal host arch if none is passed.
-
-Upstream HG 63a843fec103157a6c4048d5486c4ba0843439a3
----
- tests/boot-fullyvirt-disk-block.xml | 2 +-
- tests/boot-fullyvirt-disk-file.xml | 2 +-
- tests/install-fullyvirt-disk-block.xml | 2 +-
- tests/install-fullyvirt-disk-file.xml | 2 +-
- tests/misc-xml-escaping.xml | 2 +-
- tests/xmlconfig.py | 3 ++-
- virtinst/FullVirtGuest.py | 4 ++--
- 7 files changed, 9 insertions(+), 8 deletions(-)
-
-diff --git a/tests/boot-fullyvirt-disk-block.xml b/tests/boot-fullyvirt-disk-block.xml
-index 3f4978b..a10bc47 100644
---- a/tests/boot-fullyvirt-disk-block.xml
-+++ b/tests/boot-fullyvirt-disk-block.xml
-@@ -4,7 +4,7 @@
- <memory>409600</memory>
- <uuid>12345678-1234-1234-1234-123456789012</uuid>
- <os>
-- <type>hvm</type>
-+ <type arch='i686'>hvm</type>
- <loader>/usr/lib/xen/boot/hvmloader</loader>
- <boot dev='hd'/>
- </os>
-diff --git a/tests/boot-fullyvirt-disk-file.xml b/tests/boot-fullyvirt-disk-file.xml
-index 3ab1f57..3e33779 100644
---- a/tests/boot-fullyvirt-disk-file.xml
-+++ b/tests/boot-fullyvirt-disk-file.xml
-@@ -4,7 +4,7 @@
- <memory>409600</memory>
- <uuid>12345678-1234-1234-1234-123456789012</uuid>
- <os>
-- <type>hvm</type>
-+ <type arch='i686'>hvm</type>
- <loader>/usr/lib/xen/boot/hvmloader</loader>
- <boot dev='hd'/>
- </os>
-diff --git a/tests/install-fullyvirt-disk-block.xml b/tests/install-fullyvirt-disk-block.xml
-index b963d45..e5fc9f2 100644
---- a/tests/install-fullyvirt-disk-block.xml
-+++ b/tests/install-fullyvirt-disk-block.xml
-@@ -4,7 +4,7 @@
- <memory>409600</memory>
- <uuid>12345678-1234-1234-1234-123456789012</uuid>
- <os>
-- <type>hvm</type>
-+ <type arch='i686'>hvm</type>
- <loader>/usr/lib/xen/boot/hvmloader</loader>
- <boot dev='cdrom'/>
- </os>
-diff --git a/tests/install-fullyvirt-disk-file.xml b/tests/install-fullyvirt-disk-file.xml
-index 4d76482..80431fe 100644
---- a/tests/install-fullyvirt-disk-file.xml
-+++ b/tests/install-fullyvirt-disk-file.xml
-@@ -4,7 +4,7 @@
- <memory>409600</memory>
- <uuid>12345678-1234-1234-1234-123456789012</uuid>
- <os>
-- <type>hvm</type>
-+ <type arch='i686'>hvm</type>
- <loader>/usr/lib/xen/boot/hvmloader</loader>
- <boot dev='cdrom'/>
- </os>
-diff --git a/tests/misc-xml-escaping.xml b/tests/misc-xml-escaping.xml
-index de25549..8c36f2b 100644
---- a/tests/misc-xml-escaping.xml
-+++ b/tests/misc-xml-escaping.xml
-@@ -4,7 +4,7 @@
- <memory>409600</memory>
- <uuid>12345678-1234-1234-1234-123456789012</uuid>
- <os>
-- <type>hvm</type>
-+ <type arch='i686'>hvm</type>
- <loader>/usr/lib/xen/boot/hvmloader</loader>
- <boot dev='cdrom'/>
- </os>
-diff --git a/tests/xmlconfig.py b/tests/xmlconfig.py
-index f29510d..ee08ccc 100644
---- a/tests/xmlconfig.py
-+++ b/tests/xmlconfig.py
-@@ -55,7 +55,8 @@ class TestXMLConfig(unittest.TestCase):
- def _get_basic_fullyvirt_guest(self):
- conn = libvirt.openReadOnly("test:///default")
- g = virtinst.FullVirtGuest(connection=conn, type="xen",
-- emulator="/usr/lib/xen/bin/qemu-dm")
-+ emulator="/usr/lib/xen/bin/qemu-dm",
-+ arch="i686")
- g.name = "TestGuest"
- g.memory = int(200)
- g.maxmemory = int(400)
-diff --git a/virtinst/FullVirtGuest.py b/virtinst/FullVirtGuest.py
-index 7fe4d94..b7a19e5 100644
---- a/virtinst/FullVirtGuest.py
-+++ b/virtinst/FullVirtGuest.py
-@@ -170,8 +170,8 @@ class FullVirtGuest(Guest.XenGuest):
- Guest.Guest.__init__(self, type, connection, hypervisorURI, installer)
- self.disknode = "hd"
- self.features = { "acpi": None, "pae": util.is_pae_capable(), "apic": None }
-- #if arch is None:
-- #arch = platform.machine()
-+ if arch is None:
-+ arch = platform.machine()
- self.arch = arch
-
- self.emulator = emulator
---
-1.5.6.5
-
diff --git a/debian/patches/0006-scratchdir-for-uid-0.patch b/debian/patches/0006-scratchdir-for-uid-0.patch
deleted file mode 100644
index 5c68605..0000000
--- a/debian/patches/0006-scratchdir-for-uid-0.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 8dafa6252e8ec18714698f33b1d2d7e180b38bbb Mon Sep 17 00:00:00 2001
-From: Guido Guenther <agx at sigxcpu.org>
-Date: Mon, 22 Sep 2008 12:24:43 +0200
-Subject: [PATCH] scratchdir for uid != 0
-
----
- virtinst/Guest.py | 5 ++++-
- 1 files changed, 4 insertions(+), 1 deletions(-)
-
-diff --git a/virtinst/Guest.py b/virtinst/Guest.py
-index 94d5730..1919540 100644
---- a/virtinst/Guest.py
-+++ b/virtinst/Guest.py
-@@ -323,7 +323,10 @@ class Installer(object):
- if self.type == "xen":
- if os.path.exists("/var/lib/xen"):
- return "/var/lib/xen"
-- return "/var/lib/libvirt/boot"
-+ if os.getuid() == 0:
-+ return "/var/lib/libvirt/boot"
-+ else:
-+ return os.path.expanduser("~/.libvirt/boot")
- scratchdir = property(get_scratchdir)
-
- def get_cdrom(self):
---
-1.6.0.1
-
diff --git a/debian/patches/0007-create-scratchdir-if-it-doesn-t-exist.patch b/debian/patches/0007-create-scratchdir-if-it-doesn-t-exist.patch
deleted file mode 100644
index 307a554..0000000
--- a/debian/patches/0007-create-scratchdir-if-it-doesn-t-exist.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From f63aed49d86e21d548f4c4d60a293491cbcb0941 Mon Sep 17 00:00:00 2001
-From: Guido Guenther <agx at sigxcpu.org>
-Date: Mon, 22 Sep 2008 12:41:55 +0200
-Subject: [PATCH] create scratchdir if it doesn't exist
-
----
- virtinst/ImageFetcher.py | 2 ++
- 1 files changed, 2 insertions(+), 0 deletions(-)
-
-diff --git a/virtinst/ImageFetcher.py b/virtinst/ImageFetcher.py
-index d1f2257..f43d8fa 100644
---- a/virtinst/ImageFetcher.py
-+++ b/virtinst/ImageFetcher.py
-@@ -40,6 +40,8 @@ class ImageFetcher:
- self.scratchdir = scratchdir
-
- def saveTemp(self, fileobj, prefix):
-+ if not os.path.exists(self.scratchdir):
-+ os.makedirs(self.scratchdir, 0750)
- (fd, fn) = tempfile.mkstemp(prefix="virtinst-" + prefix, dir=self.scratchdir)
- block_size = 16384
- try:
---
-1.5.6.5
-
diff --git a/debian/patches/0008-use-virtio-for-Lenny-guests.patch b/debian/patches/0008-use-virtio-for-Lenny-guests.patch
deleted file mode 100644
index 1b20f05..0000000
--- a/debian/patches/0008-use-virtio-for-Lenny-guests.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 1fcf93226e729ff9d258817b88cd13ffba2e2ba8 Mon Sep 17 00:00:00 2001
-From: Guido Guenther <agx at sigxcpu.org>
-Date: Thu, 25 Sep 2008 19:50:38 +0200
-Subject: [PATCH] use virtio for Lenny guests
-
----
- virtinst/FullVirtGuest.py | 6 +++++-
- 1 files changed, 5 insertions(+), 1 deletions(-)
-
-diff --git a/virtinst/FullVirtGuest.py b/virtinst/FullVirtGuest.py
-index b7a19e5..7795860 100644
---- a/virtinst/FullVirtGuest.py
-+++ b/virtinst/FullVirtGuest.py
-@@ -84,7 +84,11 @@ class FullVirtGuest(Guest.XenGuest):
- "sles10": { "label": "Suse Linux Enterprise Server",
- "distro": "suse" },
- "debianetch": { "label": "Debian Etch", "distro": "debian" },
-- "debianlenny": { "label": "Debian Lenny", "distro": "debian" },
-+ "debianlenny": { "label": "Debian Lenny", "distro": "debian",
-+ "devices" : {
-+ "disk" : { "bus" : [ (["kvm"], "virtio") ] },
-+ "net" : { "model" : [ (["kvm"], "virtio") ] }
-+ }},
- "ubuntuhardy": { "label": "Ubuntu Hardy", "distro": "ubuntu",
- "devices" : {
- "net" : { "model" : [ (["kvm"], "virtio") ] }
---
-1.5.6.5
-
diff --git a/debian/patches/0009-Add-support-for-Debian-Xen-paravirt-installs.patch b/debian/patches/0009-Add-support-for-Debian-Xen-paravirt-installs.patch
deleted file mode 100644
index f07d011..0000000
--- a/debian/patches/0009-Add-support-for-Debian-Xen-paravirt-installs.patch
+++ /dev/null
@@ -1,81 +0,0 @@
-From 54b46ed5a7fdb9eb9e2cffc5ae5d387857cf27ae Mon Sep 17 00:00:00 2001
-From: =?utf-8?q?Guido=20G=C3=BCnther?= <agx at sigxcpu.org>
-Date: Thu, 30 Oct 2008 15:01:16 +0100
-Subject: [PATCH] Add support for Debian Xen paravirt installs
-
-Lenny supports this. Also add support for
-'http://people.debian.org/~joeyh/d-i/' which is the location of the
-debian-installer daily builds but has a slightly different layout (images/daily
-instead of current/images).
----
- virtinst/OSDistro.py | 42 ++++++++++++++++++++++++++++++++++--------
- 1 files changed, 34 insertions(+), 8 deletions(-)
-
-diff --git a/virtinst/OSDistro.py b/virtinst/OSDistro.py
-index 846a165..b4b65a9 100644
---- a/virtinst/OSDistro.py
-+++ b/virtinst/OSDistro.py
-@@ -487,17 +487,25 @@ class SuseDistro(Distro):
-
-
- class DebianDistro(Distro):
-- def isValidStore(self, fetcher, progresscb):
-- # Don't support any paravirt installs
-- if self.type is not None and self.type != "hvm":
-- return False
-+ # location e.g. http://ftp.egr.msu.edu/debian/dists/sarge/main/installer-i386/
-+
-+ def __init__(self, uri, type=None, scratchdir=None, arch=None):
-+ Distro.__init__(self, uri, type, scratchdir, arch)
-+ if re.match(r'i[4-9]86', arch):
-+ self.arch = 'i386'
-+ self._prefix = 'current/images'
-
-+ def isValidStore(self, fetcher, progresscb):
- file = None
- try:
- try:
- file = None
-- if fetcher.hasFile("current/images/MANIFEST"):
-- file = fetcher.acquireFile("current/images/MANIFEST",
-+ if fetcher.hasFile("%s/MANIFEST" % self._prefix):
-+ file = fetcher.acquireFile("%s/MANIFEST" % self._prefix,
-+ progresscb)
-+ elif fetcher.hasFile("images/daily/MANIFEST"):
-+ self._prefix = "images/daily"
-+ file = fetcher.acquireFile("%s/MANIFEST" % self._prefix,
- progresscb)
- else:
- logging.debug("Doesn't look like a Debian distro.")
-@@ -523,8 +531,26 @@ class DebianDistro(Distro):
- return False
-
- def acquireBootDisk(self, fetcher, progresscb):
-- # eg from http://ftp.egr.msu.edu/debian/dists/sarge/main/installer-i386/
-- return fetcher.acquireFile("current/images/netboot/mini.iso", progresscb)
-+ return fetcher.acquireFile("%s/netboot/mini.iso" % self._prefix, progresscb)
-+
-+ def acquireKernel(self, fetcher, progresscb):
-+ if self.type is None or self.type == "hvm":
-+ kernelpath = "%s/netboot/debian-installer/%s/linux" % (self._prefix, self.arch)
-+ initrdpath = "%s/netboot/debian-installer/%s/initrd.gz" % (self._prefix, self.arch)
-+ else:
-+ kernelpath = "%s/netboot/xen/vmlinuz" % self._prefix
-+ initrdpath = "%s/netboot/xen/initrd.gz" % self._prefix
-+
-+ kernel = fetcher.acquireFile(kernelpath, progresscb)
-+ try:
-+ initrd = fetcher.acquireFile(initrdpath, progresscb)
-+ if fetcher.location.startswith("/"):
-+ # Local host path, so can't pass a location to guest for install method
-+ return (kernel, initrd, "")
-+ else:
-+ return (kernel, initrd, "method=" + fetcher.location)
-+ except:
-+ os.unlink(kernel)
-
-
- class UbuntuDistro(Distro):
---
-1.6.0.1
-
diff --git a/debian/patches/0010-look-for-keymap-in-xorg.conf-too.patch b/debian/patches/0010-look-for-keymap-in-xorg.conf-too.patch
deleted file mode 100644
index 22e4e8e..0000000
--- a/debian/patches/0010-look-for-keymap-in-xorg.conf-too.patch
+++ /dev/null
@@ -1,84 +0,0 @@
-From e7893efa29e65b0a4b66351f376798994f2b750f Mon Sep 17 00:00:00 2001
-From: =?utf-8?q?Guido=20G=C3=BCnther?= <agx at sigxcpu.org>
-Date: Sat, 29 Nov 2008 12:53:32 +0100
-Subject: [PATCH] look for keymap in xorg.conf too
-
----
- virtinst/util.py | 36 +++++++++++++++++++++++++++++++-----
- 1 files changed, 31 insertions(+), 5 deletions(-)
-
-diff --git a/virtinst/util.py b/virtinst/util.py
-index e7742db..8e144ee 100644
---- a/virtinst/util.py
-+++ b/virtinst/util.py
-@@ -33,6 +33,7 @@ from virtinst import CapabilitiesParser
-
-
- KEYBOARD_DIR = "/etc/sysconfig/keyboard"
-+XORG_CONF = "/etc/X11/xorg.conf"
-
- def default_route():
- route_file = "/proc/net/route"
-@@ -273,6 +274,27 @@ def compareMAC(p, q):
- return -1
- return 0
-
-+def xorg_keymap():
-+ """Look in /etc/X11/xorg.conf for the host machine's keymap, and attempt to
-+ map it to a keymap supported by qemu"""
-+
-+ import keytable
-+ kt = None
-+ try:
-+ f = open(XORG_CONF, "r")
-+ except IOError, e:
-+ logging.debug('Could not open "%s": %s ' % (XORG_CONF, str(e)))
-+ else:
-+ keymap_re = re.compile(r'\s*Option\s+"XkbLayout"\s+"(?P<kt>[a-z-]+)"')
-+ for line in f:
-+ m = keymap_re.match(line)
-+ if m:
-+ kt = m.group('kt')
-+ else:
-+ logging.debug("Didn't find keymap '%s' in keytable!" % kt)
-+ 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"""
-@@ -280,10 +302,13 @@ def default_keymap():
- # Set keymap to same as hosts
- import keytable
- keymap = "en-us"
-+ kt = None
-+
- try:
- f = open(KEYBOARD_DIR, "r")
- except IOError, e:
-- logging.debug('Could not open "/etc/sysconfig/keyboard" ' + str(e))
-+ logging.debug('Could not open "%s": %s' % (KEYBOARD_DIR, str(e)))
-+ kt = xorg_keymap()
- else:
- while 1:
- s = f.readline()
-@@ -291,11 +316,12 @@ def default_keymap():
- break
- if re.search("KEYTABLE", s) != None:
- kt = s.split('"')[1]
-- if keytable.keytable.has_key(kt.lower()):
-- keymap = keytable.keytable[kt]
-- else:
-- logging.debug("Didn't find keymap '%s' in keytable!" % kt)
- f.close()
-+
-+ if kt and keytable.keytable.has_key(kt.lower()):
-+ keymap = keytable.keytable[kt]
-+ else:
-+ logging.debug("Didn't find keymap '%s' in keytable!" % kt)
- return keymap
-
- def pygrub_path(conn=None):
---
-1.6.0.3
-
diff --git a/debian/patches/series b/debian/patches/series
index 513b5b2..34aba7f 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,10 +1,3 @@
0001-Don-t-require-256MB-on-Debian-installations.patch
0002-fix-path-to-hvmloader.patch
0003-Fix-path-to-pygrub.patch
-0004-virt-convert-Fix-crash-caused-by-accessing-now-priv.patch
-0005-Explicitly-set-FullVirtGuest-arch-to-equal-host-arch.patch
-0006-scratchdir-for-uid-0.patch
-0007-create-scratchdir-if-it-doesn-t-exist.patch
-0008-use-virtio-for-Lenny-guests.patch
-0009-Add-support-for-Debian-Xen-paravirt-installs.patch
-0010-look-for-keymap-in-xorg.conf-too.patch
--
Virt Installer packaging
More information about the Pkg-libvirt-commits
mailing list