Merge lp:~yuningdodo/usb-creator/usb-creator.lp1325801-sync-syslinux-c32-files into lp:ubuntu/vivid/usb-creator

[Yu Ning]

Make sure we use the same version of mbr.bin and syslinux *.c32 files. (LP: #1325801)

This patch was originally uploaded in bug #1325801 comment #83, I have made some tests on trusty, it can correctly create the usbstick for ubuntu 12.04, 14.10, etc., and even xubuntu.

[Mathieu Trudel-Lapierre (cyphermox)]

Could you please resubmit these changes a against lp:~usb-creator-hackers/usb-creator/trunk?

I'm not sure this is going to fix things for writing pre-14.10 images using a 14.10 system; the files are now split into directories which probably ought to be taken into account as well. By my initial testing, just copying the directory or the files over in syslinux/ directly don't seem to fix this, but it also only affects non-EFI boots.

You've tested writing various images from trusty. Have you also tested writing, for example, a trusty image from utopic, to see if the resulting image can be properly booted?

review: Needs Fixing

[Yu Ning (yuningdodo)]

Mathieu, thanks very much for the review, I'll resubmit against the trunk branch later.

[Yu Ning (yuningdodo)]

review: Disapprove

Unmerged revisions

92. By Yu Ning on 2015-02-12

Make sure we use the same version of mbr.bin and syslinux *.c32 files. (LP: #1325801)

=== modified file 'usbcreator/install.py'
--- usbcreator/install.py	2013-01-28 12:51:45 +0000
+++ usbcreator/install.py	2015-02-12 07:35:46 +0000
@@ -19,6 +19,7 @@
 from usbcreator.misc import (
     USBCreatorProcessException,
     callable,
+    find_on_path,
     fs_size,
     popen,
     )
@@ -323,6 +324,16 @@
                 if f:
                     f.close()
         self.check()
+        if self.need_syslinux_legacy() and find_on_path('syslinux-legacy'):
+            syslinux = 'syslinux-legacy'
+        else:
+            syslinux = 'syslinux'
+        for dstname in glob.iglob(os.path.join(self.target, 'syslinux', '*.c32')):
+            filename = os.path.basename(dstname)
+            srcname = os.path.join(os.sep, 'usr', 'lib', syslinux, filename)
+            if os.path.isfile(srcname):
+                shutil.copyfile(srcname, dstname)
+        self.check()
 
     def create_persistence(self):
         logging.debug('create_persistence')