Merge lp:~nuclearbob/utah/desktop-kernel-detect into lp:utah

[Max Brustkern]

This branch checks the bootloader configuration files on a desktop image and chooses the kernel that is most referenced by those (but not the memtest kernel.) This should fix the raring-desktop-amd64 image problems.

[Joe Talbott (joetalbott)]

Looks good to me.

review: Approve

=== modified file 'utah/provisioning/provisioning.py'
--- utah/provisioning/provisioning.py	2012-10-25 20:07:44 +0000
+++ utah/provisioning/provisioning.py	2012-11-13 20:12:25 +0000
@@ -821,7 +821,31 @@
                 kernelpath = 'linux'
             elif self.installtype == 'desktop':
                 self.logger.debug('Desktop image detected')
-                kernelpath = './casper/vmlinuz'
+                # Setup the old default kernel path in case none are found
+                kernels = {'casper/vmlinuz':0}
+                # Scan bootloader config files to find kernel images
+                cfgfiles = ['isolinux/txt.cfg', 'isolinux/rqtxt.cfg',
+                            'boot/grub/grub.cfg', 'boot/grub/loopback.cfg']
+                for cfgfile in cfgfiles:
+                    if cfgfile in self.image.listfiles(returnlist=True):
+                        stdout = self.image.dump(cfgfile).communicate()[0]
+                        for line in stdout.splitlines():
+                            if 'kernel' in line or 'linux' in line:
+                                newkernel = line.split()[1].strip('./')
+                                if 'mt86plus' in newkernel:
+                                    self.logger.debug('Rejecting '
+                                                      'memtest kernel')
+                                else:
+                                    self.logger.debug('Found kernel: '
+                                                      + newkernel)
+                                    if newkernel in kernels:
+                                        kernels[newkernel] += 1
+                                    else:
+                                        kernels[newkernel] = 1
+                # Now we have a list of kernel paths and the number of times
+                # each once occurs. We'll use the one that occurs most.
+                kernelpath = sorted([[kernels[kernel], kernel]
+                     for kernel in kernels], reverse=True)[0][1]
             kernel = os.path.join(tmpdir, 'kernel')
             self.image.extract(kernelpath, outfile=kernel)
         else:
@@ -847,6 +871,7 @@
                 initrdpath = 'initrd.gz'
             elif self.installtype == 'desktop':
                 self.logger.debug('Desktop image detected')
+                # TODO: scan for this like desktop
                 initrdpath = './casper/initrd.lz'
             initrd = os.path.join(tmpdir, os.path.basename(initrdpath))
             self.image.extract(initrdpath, outfile=initrd)