← Back to team overview

launchpad-reviewers team mailing list archive

[Merge] lp:~andreserl/maas/raring_support into lp:maas

 

Andres Rodriguez has proposed merging lp:~andreserl/maas/raring_support into lp:maas.

Commit message:
Add Raring support.

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)

For more details, see:
https://code.launchpad.net/~andreserl/maas/raring_support/+merge/145522
-- 
https://code.launchpad.net/~andreserl/maas/raring_support/+merge/145522
Your team Launchpad code reviewers is requested to review the proposed merge of lp:~andreserl/maas/raring_support into lp:maas.
=== modified file 'etc/maas/import_pxe_files'
--- etc/maas/import_pxe_files	2012-11-12 14:32:26 +0000
+++ etc/maas/import_pxe_files	2013-01-30 00:42:22 +0000
@@ -13,7 +13,7 @@
 
 
 #RELEASES="precise"
-RELEASES="precise quantal"
+RELEASES="precise quantal raring"
 #ARCHES="amd64/generic i386/generic armhf/highbank"
 #LOCALE="en_US"
 #IMPORT_EPHEMERALS=1

=== modified file 'src/maasserver/enum.py'
--- src/maasserver/enum.py	2012-10-08 17:05:43 +0000
+++ src/maasserver/enum.py	2013-01-30 00:42:22 +0000
@@ -139,11 +139,14 @@
     precise = 'precise'
     #:
     quantal = 'quantal'
+    #:
+    raring = 'raring'
 
 DISTRO_SERIES_CHOICES = (
     (DISTRO_SERIES.default, 'Default Ubuntu Release'),
     (DISTRO_SERIES.precise, 'Ubuntu 12.04 LTS "Precise Pangolin"'),
     (DISTRO_SERIES.quantal, 'Ubuntu 12.10 "Quantal Quetzal"'),
+    (DISTRO_SERIES.raring, 'Ubuntu 13.04 "Raring Ringtail"'),
 )
 
 

=== modified file 'src/provisioningserver/pxe/config.local.x86.template'
--- src/provisioningserver/pxe/config.local.x86.template	2012-08-17 11:12:09 +0000
+++ src/provisioningserver/pxe/config.local.x86.template	2013-01-30 00:42:22 +0000
@@ -3,3 +3,4 @@
 LABEL local
   SAY Booting local disk ...
   KERNEL chain.c32
+  APPEND hd0