vmbuilder team mailing list archive
-
vmbuilder team
-
Mailing list archive
-
Message #00050
[Merge] lp:~mvo/vmbuilder/add-natty into lp:vmbuilder
Michael Vogt has proposed merging lp:~mvo/vmbuilder/add-natty into lp:vmbuilder.
Requested reviews:
VMBuilder (vmbuilder)
Adds natty and fixes no longer available kernels on maverick.
--
https://code.launchpad.net/~mvo/vmbuilder/add-natty/+merge/40977
Your team VMBuilder is requested to review the proposed merge of lp:~mvo/vmbuilder/add-natty into lp:vmbuilder.
=== modified file 'VMBuilder/plugins/ubuntu/distro.py'
--- VMBuilder/plugins/ubuntu/distro.py 2010-06-15 19:55:36 +0000
+++ VMBuilder/plugins/ubuntu/distro.py 2010-11-16 16:37:57 +0000
@@ -28,7 +28,8 @@
class Ubuntu(Distro):
name = 'Ubuntu'
arg = 'ubuntu'
- suites = ['dapper', 'gutsy', 'hardy', 'intrepid', 'jaunty', 'karmic', 'lucid', 'maverick']
+ suites = ['dapper', 'gutsy', 'hardy', 'intrepid', 'jaunty',
+ 'karmic', 'lucid', 'maverick', 'natty']
# Maps host arch to valid guest archs
valid_archs = { 'amd64' : ['amd64', 'i386', 'lpia' ],
=== modified file 'VMBuilder/plugins/ubuntu/maverick.py'
--- VMBuilder/plugins/ubuntu/maverick.py 2010-06-15 10:51:16 +0000
+++ VMBuilder/plugins/ubuntu/maverick.py 2010-11-16 16:37:57 +0000
@@ -19,4 +19,5 @@
from VMBuilder.plugins.ubuntu.lucid import Lucid
class Maverick(Lucid):
- pass
+ valid_flavours = { 'i386' : ['generic', 'generic-pae', 'virtual'],
+ 'amd64' : ['generic', 'server', 'virtual'] }
=== added file 'VMBuilder/plugins/ubuntu/natty.py'
--- VMBuilder/plugins/ubuntu/natty.py 1970-01-01 00:00:00 +0000
+++ VMBuilder/plugins/ubuntu/natty.py 2010-11-16 16:37:57 +0000
@@ -0,0 +1,22 @@
+#
+# Uncomplicated VM Builder
+# Copyright (C) 2010 Canonical Ltd.
+#
+# See AUTHORS for list of contributors
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License version 3, as
+# published by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
+#
+from VMBuilder.plugins.ubuntu.maverick import Maverick
+
+class Natty(Maverick):
+ pass
Follow ups