Fix-up several packages to include the correct Conflicts and Replaces

[invirt/packages/invirt-xen-config.git] / invirt-database

diff --git a/invirt-database b/invirt-database
index ba97ed6..76e959e 100644 (file)
--- a/invirt-database
+++ b/invirt-database
@@ -2,8 +2,6 @@
 from invirt.database import models, connect
 from invirt.config import structs as config
 import re
 from invirt.database import models, connect
 from invirt.config import structs as config
 import re

-import tempfile
-from subprocess import call

 
 connect()
 prefix = "d_"
 
 connect()
 prefix = "d_"

@@ -52,8 +50,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')