From: Steven Valdez <dvorak42@mit.edu>
Date: Thu, 1 Aug 2013 19:55:04 +0000 (-0400)
Subject: Merging new sysvm definitions
X-Git-Tag: 1.1.52~1
X-Git-Url: http://xvm.mit.edu/gitweb/invirt/packages/xvm-prodconfig.git/commitdiff_plain/e9b0da38f0691330dd680eedd4108ea62366e6db?hp=b370249b076912ec790f2398b187713c5a2167a9

Merging new sysvm definitions
---

diff --git a/debian/changelog b/debian/changelog
index faf5713..78ba97d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,15 +1,22 @@
-xvm-prodconfig (1.1.51) unstable; urgency=low
+xvm-prodconfig (1.1.52) unstable; urgency=low
 
   * Adding noc config for db.
 
  -- Steven Valdez <dvorak42@mit.edu>  Thu, 01 Aug 2013 15:53:53 -0400
 
-xvm-prodconfig (1.1.50) unstable; urgency=low
+xvm-prodconfig (1.1.51) unstable; urgency=low
 
   * Adding achernya, glasgall, dvorak42 to errormail_exclude.
 
  -- Steven Valdez <dvorak42@mit.edu>  Tue, 23 Jul 2013 23:41:12 -0400
 
+xvm-prodconfig (1.1.50) precise; urgency=low
+
+  * Update s_remote and s_console sysvm definitions for precise.
+
+ -- Adam Glasgall <glasgall@mit.edu>  Tue, 23 Jul 2013 23:43:44 -0400
+>>>>>>> origin/glasgall-precise
+
 xvm-prodconfig (1.1.49) unstable; urgency=low
 
   * Adding xh5-xh8 to the cluster.
diff --git a/sysvms/s_console b/sysvms/s_console
index e71318f..c07c471 100644
--- a/sysvms/s_console
+++ b/sysvms/s_console
@@ -1,14 +1,12 @@
 
 import os
 
-# temporary hack so we can get the sysvms off the old hardware
-#release     = os.uname()[2]
-release     = "2.6.24-32-xen"
-kernel      = '/boot/hardy/vmlinuz-%s' % release
-ramdisk     = '/boot/hardy/initrd.img-%s' % release
+release     = os.uname()[2]
+kernel      = '/boot/vmlinuz-%s' % release
+ramdisk     = '/boot/initrd.img-%s' % release
 memory      = '256'
 
-disk        = ['phy:xenvg/s_console_hda,hda,w']
+disk        = ['phy:xenvg/s_console_precise_xvda,xvda,w']
 
 name        = 's_console'
 
@@ -18,6 +16,5 @@ on_poweroff = 'destroy'
 on_reboot   = 'restart'
 on_crash    = 'restart'
 
-root = '/dev/hda1 ro'
-extra = '2 console=xvc0'
-
+root = '/dev/xvda1 ro'
+extra = '2 console=hvc0'
diff --git a/sysvms/s_remote b/sysvms/s_remote
index bbca0b6..40d2c5d 100644
--- a/sysvms/s_remote
+++ b/sysvms/s_remote
@@ -1,14 +1,12 @@
 
 import os
 
-# temporary hack so we can get the sysvms off the old hardware
-#release     = os.uname()[2]
-release     = "2.6.24-32-xen"
-kernel      = '/boot/hardy/vmlinuz-%s' % release
-ramdisk     = '/boot/hardy/initrd.img-%s' % release
+release     = os.uname()[2]
+kernel      = '/boot/vmlinuz-%s' % release
+ramdisk     = '/boot/initrd.img-%s' % release
 memory      = '512'
 
-disk        = ['phy:xenvg/s_remote_hda,hda,w']
+disk        = ['phy:xenvg/s_remote_precise_xvda,xvda,w']
 
 name        = 's_remote'
 
@@ -18,6 +16,5 @@ on_poweroff = 'destroy'
 on_reboot   = 'restart'
 on_crash    = 'restart'
 
-root = "/dev/hda1 ro"
-extra = '2 console=xvc0'
-
+root = "/dev/xvda1 ro"
+extra = '2 console=hvc0'