Merged in sysvm hack.

diff --git a/debian/changelog b/debian/changelog
index 32ccaed..3ed605c 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,24 @@ xvm-prodconfig (1.1.49) unstable; urgency=low
 
  -- Steven Valdez <dvorak42@mit.edu>  Tue, 23 Jul 2013 15:23:46 -0400
 
+xvm-prodconfig (1.1.48~migration8) precise; urgency=low
+
+  * fix kernel/initrd paths for s_master
+
+ -- Adam Glasgall <glasgall@mit.edu>  Sun, 21 Jul 2013 22:49:01 -0400
+
+xvm-prodconfig (1.1.48~migration7) precise; urgency=low
+
+  * Do the temporary hack for the other two sysvms.
+
+ -- Adam Glasgall <glasgall@mit.edu>  Sun, 21 Jul 2013 22:21:28 -0400
+
+xvm-prodconfig (1.1.48~migration6) precise; urgency=low
+
+  * temporary hack so we can move sysvms off old hardware
+
+ -- Adam Glasgall <glasgall@mit.edu>  Sun, 21 Jul 2013 21:41:16 -0400
+
 xvm-prodconfig (1.1.48~migration5) unstable; urgency=low
 
   * Adding arklay-mansion to precise cluster.

diff --git a/sysvms/s_console b/sysvms/s_console
index e27f0cf..e71318f 100644 (file)
--- a/sysvms/s_console
+++ b/sysvms/s_console
@@ -1,9 +1,11 @@
 
 import os
 
-release     = os.uname()[2]
-kernel      = '/boot/vmlinuz-%s' % release
-ramdisk     = '/boot/initrd.img-%s' % release
+# 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
 memory      = '256'
 
 disk        = ['phy:xenvg/s_console_hda,hda,w']

diff --git a/sysvms/s_master b/sysvms/s_master
index 2fba5ca..3a9543d 100644 (file)
--- a/sysvms/s_master
+++ b/sysvms/s_master
@@ -1,9 +1,11 @@
 
 import os
 
-release     = os.uname()[2]
-kernel      = '/boot/vmlinuz-%s' % release
-ramdisk     = '/boot/initrd.img-%s' % release
+# 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
 memory      = '1024'
 
 disk        = ['phy:xenvg/s_master_hda,hda,w',

diff --git a/sysvms/s_remote b/sysvms/s_remote
index 7744102..bbca0b6 100644 (file)
--- a/sysvms/s_remote
+++ b/sysvms/s_remote
@@ -1,9 +1,11 @@
 
 import os
 
-release     = os.uname()[2]
-kernel      = '/boot/vmlinuz-%s' % release
-ramdisk     = '/boot/initrd.img-%s' % release
+# 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
 memory      = '512'
 
 disk        = ['phy:xenvg/s_remote_hda,hda,w']