kernel plugin: vmlinuz -> kernel.img hard link

snapcraft/plugins/kernel.py

@@ -309,8 +309,7 @@ def _copy_vmlinuz(self):
                 'kernel build did not output a vmlinux binary in top level '
                 'dir, expected {!r}'.format(src))
         os.link(src, dst)
-        # why oh why?
-        os.link(src, os.path.join(self.installdir, 'vmlinuz'))
+        os.link(src, os.path.join(self.installdir, 'kernel.img'))
 
     def _copy_system_map(self):
         src = os.path.join(self.builddir, 'System.map')

snapcraft/tests/test_plugin_kernel.py

@@ -150,7 +150,7 @@ def _assert_generic_check_call(self, builddir, installdir, os_snap_path):
         ])
 
     def _assert_common_assets(self, installdir):
-        for asset in ['initrd-4.4.2.img', 'initrd.img', 'vmlinuz',
+        for asset in ['initrd-4.4.2.img', 'initrd.img', 'kernel.img',
                       'bzImage-4.4.2', 'System.map-4.4.2']:
             self.assertTrue(os.path.exists(os.path.join(installdir, asset)),
                             'Missing {}'.format(asset))