@@ -276,8 +276,16 @@ class Installer(object):

             process = subprocess.Popen(['rm', '-rf', os.path.join(self.photon_root, "installer")], stdout=self.output)

             retval = process.wait()

         else:

-            #Build the initramfs

-            process = subprocess.Popen([self.chroot_command, '-w', self.photon_root, './mkinitramfs', '-n', '/boot/initrd.img-no-kmods'],  stdout=self.output)

+            #Build the initramfs by passing in the kernel version

+            version_string = ''	

+            for root, dirs, files in os.walk(self.rpm_path):

+                for name in files:

+                    if fnmatch.fnmatch(name, 'linux-[0-9]*.rpm'):

+                        version_array = name.split('-')

+                        if len(version_array) > 2:

+                            version_string = version_array[1]

+

+            process = subprocess.Popen([self.chroot_command, '-w', self.photon_root, './mkinitramfs', '-n', '/boot/initrd.img-no-kmods', '-k', version_string],  stdout=self.output)

             retval = process.wait()

@@ -181,11 +181,11 @@ fi

 # Install the kernel modules if requested

 if [ -n "$KERNEL_VERSION" ]; then

-  find                                                                        \

-     /lib/modules/$KERNEL_VERSION/kernel/{crypto,fs,lib}                      \

-     /lib/modules/$KERNEL_VERSION/kernel/drivers/{block,ata,md,firewire}      \

-     /lib/modules/$KERNEL_VERSION/kernel/drivers/{scsi,message,pcmcia,virtio} \

-     /lib/modules/$KERNEL_VERSION/kernel/drivers/usb/{host,storage}           \

+  find                                                                                     \

+     /lib/modules/$KERNEL_VERSION/kernel/{crypto,fs,lib}                                   \

+     /lib/modules/$KERNEL_VERSION/kernel/drivers/{block,ata,md,firewire,net,xen}           \

+     /lib/modules/$KERNEL_VERSION/kernel/drivers/{scsi,message,pcmcia,virtio,hv,connector} \

+     /lib/modules/$KERNEL_VERSION/kernel/drivers/usb/{host,storage}                        \

      -type f 2> /dev/null | cpio --make-directories -p --quiet $WDIR

   cp /lib/modules/$KERNEL_VERSION/modules.{builtin,order}                     \