UTAH

Merge lp:~paride/utah/s390x-boot-device into lp:utah

  1. s390x-boot-device
  2. Merge into dev
Proposed by Paride Legovini
Status: Merged
Approved by: Dimitri John Ledkov
Approved revision: 1146
Merged at revision: 1146
Proposed branch: lp:~paride/utah/s390x-boot-device
Merge into: lp:utah
Diff against target: 22 lines (+2/-4)
1 file modified
utah/provisioning/live_server.py (+2/-4)
To merge this branch: bzr merge lp:~paride/utah/s390x-boot-device
Reviewer Review Type Date Requested Status
Canonical CI Engineering Pending
Review via email: mp+366453@code.launchpad.net

Commit message

live-server: set the boot device to cdrom/hd regardless of the arch

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'utah/provisioning/live_server.py'
2--- utah/provisioning/live_server.py 2019-04-17 13:39:28 +0000
3+++ utah/provisioning/live_server.py 2019-04-24 12:15:40 +0000
4@@ -189,8 +189,7 @@
5 ose.remove(initrde)
6 for cmdlinee in list(ose.iterfind('cmdline')):
7 ose.remove(cmdlinee)
8- if self.image.arch != 's390x':
9- ose.find('boot').set('dev', 'cdrom')
10+ ose.find('boot').set('dev', 'cdrom')
11
12 def _installxml_rewrite_disks(self, devices, image):
13 # 1. Remove all existing disks
14@@ -365,8 +364,7 @@
15 source = disk.find('source')
16 if source is not None and source.get('file') == self.answers_image_path:
17 devices.remove(disk)
18- if self.image.arch != 's390x':
19- xml.find('os').find('boot').set('dev', 'hd')
20+ xml.find('os').find('boot').set('dev', 'hd')
21 xml.write(os.path.join(tmpdir, 'final.xml'))
22 return xml
23

Subscribers

People subscribed via source and target branches