Empty merge commit to re-create correct history ordering.

diff --git a/debian/changelog b/debian/changelog
index b91d843..e1ecf4c 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,23 @@
-xvm-devconfig (0.86) precise; urgency=low
+xvm-devconfig (0.88) precise; urgency=low
 
   * Add slz to dev acl
 
  -- Alexander Chernyakhovsky <achernya@mit.edu>  Mon, 16 Nov 2015 22:50:32 -0500
 
+xvm-devconfig (0.87) precise; urgency=medium
+
+  * Boot sysvms with the host’s latest installed kernel, not the host’s
+    currently running kernel.
+
+ -- Anders Kaseorg <andersk@mit.edu>  Sat, 02 May 2015 23:29:54 -0400
+
+xvm-devconfig (0.86) precise; urgency=medium
+
+  * Fix sysvms serial console configuration: xvc0 → hvc0.
+  * Add trusty-stable and trusty-unstable pockets to master.yaml.
+
+ -- Anders Kaseorg <andersk@mit.edu>  Sat, 02 May 2015 22:59:44 -0400
+
 xvm-devconfig (0.85) precise; urgency=low
 
   * Add andersk to dev acl

diff --git a/master.yaml b/master.yaml
index 68c0d87..7385274 100644 (file)
--- a/master.yaml
+++ b/master.yaml
@@ -27,11 +27,20 @@ build:
    acl: system:xvm-root
    apt: precise-stable
    distro: precise
+  trusty-prod:
+   acl: system:xvm-root
+   apt: trusty-stable
+   distro: trusty
   precise-dev:
    acl: *adminacl
    apt: precise-unstable
    allow_backtracking: yes
    distro: precise
+  trusty-dev:
+   acl: *adminacl
+   apt: trusty-unstable
+   allow_backtracking: yes
+   distro: trusty
  tagger:
   name: Invirt Build Server
   email: invirt@mit.edu

diff --git a/sysvms/s_console b/sysvms/s_console
index a8fb4a5..9dae4c8 100644 (file)
--- a/sysvms/s_console
+++ b/sysvms/s_console
@@ -1,8 +1,8 @@
 import os
 
 release     = os.uname()[2]
-kernel      = '/boot/vmlinuz-%s' % release
-ramdisk     = '/boot/initrd.img-%s' % release
+kernel      = '/vmlinuz'
+ramdisk     = '/initrd.img'
 memory      = '256'
 
 disk        = ['phy:xenvg/s_console_xvda,xvda,w']
@@ -16,4 +16,4 @@ on_reboot   = 'restart'
 on_crash    = 'restart'
 
 root = "/dev/xvda1 ro"
-extra = '2 console=xvc0'
+extra = '2 console=hvc0'

diff --git a/sysvms/s_master b/sysvms/s_master
index 786fb5b..2794565 100644 (file)
--- a/sysvms/s_master
+++ b/sysvms/s_master
@@ -1,8 +1,8 @@
 import os
 
 release     = os.uname()[2]
-kernel      = '/boot/vmlinuz-%s' % release
-ramdisk     = '/boot/initrd.img-%s' % release
+kernel      = '/vmlinuz'
+ramdisk     = '/initrd.img'
 memory      = '512'
 
 disk        = ['phy:xenvg/s_master_xvda,xvda,w']
@@ -16,4 +16,4 @@ on_reboot   = 'restart'
 on_crash    = 'restart'
 
 root = "/dev/xvda1 ro"
-extra = '2 console=xvc0'
+extra = '2 console=hvc0'

diff --git a/sysvms/s_remote b/sysvms/s_remote
index a5116f3..dce4c56 100644 (file)
--- a/sysvms/s_remote
+++ b/sysvms/s_remote
@@ -1,8 +1,8 @@
 import os
 
 release     = os.uname()[2]
-kernel      = '/boot/vmlinuz-%s' % release
-ramdisk     = '/boot/initrd.img-%s' % release
+kernel      = '/vmlinuz'
+ramdisk     = '/initrd.img'
 memory      = '512'
 
 disk        = ['phy:xenvg/s_remote_xvda,xvda,w']
@@ -16,4 +16,4 @@ on_reboot   = 'restart'
 on_crash    = 'restart'
 
 root = "/dev/xvda1 ro"
-extra = '2 console=xvc0'
+extra = '2 console=hvc0'