← Back to branch summary

~ubuntu-branches/ubuntu/raring/virtinst/raring-proposed

« back to all changes in this revision

Viewing changes to debian/patches/0002-Don-t-require-256MB-on-Debian-installations.patch

  • Committer: Bazaar Package Importer
  • Author(s): Soren Hansen
  • Date: 2008-08-23 12:57:30 UTC
  • mfrom: (1.1.4 lenny)
  • Revision ID: james.westby@ubuntu.com-20080823125730-u1othafetd50dbd8
Tags: 0.300.3-5ubuntu1
https://launchpad.net/bugs/254097
* Merge from debian unstable, remaining changes:
  - Rename binary to python-virtinst
  - Version dependency on libvirt (to make sure we can handle the virtio
    stuff).
  - 9001_virtio_virt-install.patch: Add support for virtio and enable
    virtio-net for hardy guests. (LP: #254097)
  - Use python-central instead of python-support

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/0002-Don-t-require-256MB-on-Debian-installations.patch
1
 
From 1da974c61d62d10549a88bee847d0ea34a1aa3ac Mon Sep 17 00:00:00 2001
 
1
From ffdf938dbc2f8c213824f3dc6aee666e3e467467 Mon Sep 17 00:00:00 2001
2
2
From: Guido Guenther <agx@sigxcpu.org>
3
3
Date: Tue, 24 Jun 2008 15:26:29 +0200
4
4
Subject: [PATCH] Don't require 256MB on Debian installations
23
23
     cli.get_vcpus(options.vcpus, options.check_cpu, guest, conn)
24
24
 
25
25
diff --git a/virtinst/cli.py b/virtinst/cli.py
26
 
index b38b340..2a93919 100644
 
26
index b38b340..8382fec 100644
27
27
--- a/virtinst/cli.py
28
28
+++ b/virtinst/cli.py
29
29
@@ -145,12 +145,16 @@ def get_name(name, guest):
31
31
             name = None
32
32
 
33
33
-def get_memory(memory, guest):
34
 
+def get_memory(memory, guest, os_variant):
 
34
+def get_memory(memory, guest, os_variant=None):
35
35
+    if os_variant in [ 'debianLenny', 'debianEtch' ]:
36
36
+        min_ram = 64
37
37
+    else:
47
47
                 memory = None
48
48
                 continue
49
49
-- 
50
 
1.5.5.4
 
50
1.5.6.3
51
51