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

Proposed by Yu Ning on 2015-02-12
Status: Rejected
Rejected by: Mathieu Trudel-Lapierre on 2015-02-16
Proposed branch: lp:~yuningdodo/usb-creator/usb-creator.lp1325801-sync-syslinux-c32-files
Merge into: lp:ubuntu/vivid/usb-creator
Diff against target: 28 lines (+11/-0)
1 file modified
usbcreator/install.py (+11/-0)
To merge this branch: bzr merge lp:~yuningdodo/usb-creator/usb-creator.lp1325801-sync-syslinux-c32-files
Reviewer Review Type Date Requested Status
Yu Ning (community) Disapprove on 2015-02-15
Mathieu Trudel-Lapierre 2015-02-12 Needs Fixing on 2015-02-13
usb-creator hackers 2015-02-12 Pending
Review via email: mp+249454@code.launchpad.net

Description of the change

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.

To post a comment you must log in.
Mathieu Trudel-Lapierre (cyphermox) wrote :

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) wrote :

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)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'usbcreator/install.py'
2--- usbcreator/install.py 2013-01-28 12:51:45 +0000
3+++ usbcreator/install.py 2015-02-12 07:35:46 +0000
4@@ -19,6 +19,7 @@
5 from usbcreator.misc import (
6 USBCreatorProcessException,
7 callable,
8+ find_on_path,
9 fs_size,
10 popen,
11 )
12@@ -323,6 +324,16 @@
13 if f:
14 f.close()
15 self.check()
16+ if self.need_syslinux_legacy() and find_on_path('syslinux-legacy'):
17+ syslinux = 'syslinux-legacy'
18+ else:
19+ syslinux = 'syslinux'
20+ for dstname in glob.iglob(os.path.join(self.target, 'syslinux', '*.c32')):
21+ filename = os.path.basename(dstname)
22+ srcname = os.path.join(os.sep, 'usr', 'lib', syslinux, filename)
23+ if os.path.isfile(srcname):
24+ shutil.copyfile(srcname, dstname)
25+ self.check()
26
27 def create_persistence(self):
28 logging.debug('create_persistence')

Subscribers

People subscribed via source and target branches

to all changes: