Choose what kernel to use for the autoinstaller based on what dom0 is

running

svn path=/trunk/packages/invirt-xen-config/; revision=1680

diff --git a/debian/changelog b/debian/changelog
index 0f1a555..5a375b7 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+invirt-xen-config (0.0.16) unstable; urgency=low
+
+  * Pick the kernel and initrd for the autoinstaller based on the kernel
+    the dom0 is currently running
+
+ -- Evan Broder <broder@mit.edu>  Sat, 15 Nov 2008 23:45:30 -0500
+

 invirt-xen-config (0.0.15) unstable; urgency=low
 
   * Set the max memory to a really high number so we can bump it for users
 invirt-xen-config (0.0.15) unstable; urgency=low
 
   * Set the max memory to a really high number so we can bump it for users

diff --git a/invirt-database b/invirt-database
index ba97ed6..b914701 100644 (file)
--- a/invirt-database
+++ b/invirt-database
@@ -52,8 +52,10 @@ else:
 if 'installer_options' in locals(): #Installer
     disk.append('phy:/dev/xenvg/s_install_hda,hdb,r')
 
 if 'installer_options' in locals(): #Installer
     disk.append('phy:/dev/xenvg/s_install_hda,hdb,r')
 

-    kernel = '/boot/vmlinuz-2.6.24-19-xen' #From hardy
-    ramdisk = '/boot/initrd.img-2.6.24-19-xen'
+    import os
+    release = os.uname()[2]
+    kernel = '/boot/vmlinuz-%s' % release
+    ramdisk = '/boot/initrd.img-%s' % release

 
     if not machine.nics:
         raise RuntimeError('You must have a nic to autoinstall')
 
     if not machine.nics:
         raise RuntimeError('You must have a nic to autoinstall')