Merge lp:~ahasenack/utah/live-server-kernel-path-1766947 into lp:utah

Proposed by Andreas Hasenack
Status: Merged
Approved by: Paul Larson
Approved revision: 1124
Merged at revision: 1124
Proposed branch: lp:~ahasenack/utah/live-server-kernel-path-1766947
Merge into: lp:utah
Diff against target: 12 lines (+1/-1)
1 file modified
utah/iso.py (+1/-1)
To merge this branch: bzr merge lp:~ahasenack/utah/live-server-kernel-path-1766947
Reviewer Review Type Date Requested Status
Paul Larson Approve
Review via email: mp+344342@code.launchpad.net

Commit message

The live-server kernel changed its name back to casper/vmlinuz (from casper/vmlinuz.efi).

Description of the change

The live-server kernel changed its name back to casper/vmlinuz (from casper/vmlinuz.efi). This made our static analysis tests fail. Changing the name back should fix it, but it's untested.

To post a comment you must log in.
Revision history for this message
Paul Larson (pwlars) wrote :

Seems reasonable to me. My only concern would be if this affects older versions? There could still be some users running it on older LTS releases. If this is only valid after a certain release, maybe we should check self.series to decide whether it should have the .efi extension?

Otherwise, looks good to me, but I would also recommend getting input from current users - jibel perhaps.

review: Approve
Revision history for this message
Steve Langasek (vorlon) wrote :

There is no older LTS release for which we have a live server image.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'utah/iso.py'
2--- utah/iso.py 2018-02-28 21:36:51 +0000
3+++ utah/iso.py 2018-04-25 18:30:53 +0000
4@@ -458,7 +458,7 @@
5 kernelpath = 'linux'
6 elif self.installtype == 'live-server':
7 self.logger.debug('Getting kernel for live-server')
8- kernelpath = 'casper/vmlinuz.efi'
9+ kernelpath = 'casper/vmlinuz'
10 elif self.installtype == 'desktop':
11 self.logger.debug('Getting kernel for desktop image')
12 # Setup the old default kernel path in case none are found

Subscribers

People subscribed via source and target branches