Handle kernel variants a little better at install time too

Make our handling of kernel variants a little bit more flexible, allowing
for the fact that uname -r might not match version-release exactly.  This
also makes it so we don't have a hard-coded list of kernel variants

1 files changed, 1 insertions, 20 deletions

diff --git a/livecd.py b/livecd.py
index f209558c5..922af8d28 100644
--- a/livecd.py
+++ b/livecd.py
@@ -339,26 +339,7 @@ class LiveCDCopyBackend(backend.AnacondaBackend):
         pass
 
     def kernelVersionList(self, rootPath = "/"):
-        versions = []
-        
-        # FIXME: we should understand more types of kernel versions and not
-        # be tied to rpm...  
-        import rpm
-        ts = rpm.TransactionSet(rootPath)
-
-        # FIXME: and make sure that the rpmdb doesn't have stale locks :/
-        for rpmfile in ["__db.000", "__db.001", "__db.002", "__db.003"]:
-            try:
-                os.unlink("%s/var/lib/rpm/%s" %(rootPath, rpmfile))
-            except:
-                log.debug("failed to unlink /var/lib/rpm/%s" %(rpmfile,))
-                
-        mi = ts.dbMatch('name', 'kernel')
-        for h in mi:
-            v = "%s-%s" %(h['version'], h['release'])
-            versions.append( (v, h['arch'], "base") )
-
-        return versions
+        return packages.rpmKernelVersionList(rootPath)
 
     def doInitialSetup(self, anaconda):
         pass