Merge lp:~mwhudson/utah/subiquity-file-lists into lp:utah

Proposed by Michael Hudson-Doyle
Status: Merged
Approved by: Joshua Powers
Approved revision: 1132
Merged at revision: 1132
Proposed branch: lp:~mwhudson/utah/subiquity-file-lists
Merge into: lp:utah
Diff against target: 36 lines (+1/-3)
3 files modified
utah/isotest/data/file_list_subiquity (+0/-1)
utah/isotest/data/file_list_subiquity_powerpc (+0/-1)
utah/isotest/iso_static_validation.py (+1/-1)
To merge this branch: bzr merge lp:~mwhudson/utah/subiquity-file-lists
Reviewer Review Type Date Requested Status
Joshua Powers (community) Approve
Canonical CI Engineering Pending
Review via email: mp+361099@code.launchpad.net
To post a comment you must log in.
1132. By Michael Hudson-Doyle

bionic compat

Revision history for this message
Joshua Powers (powersj) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'utah/isotest/data/file_list_subiquity'
2--- utah/isotest/data/file_list_subiquity 2018-04-25 19:31:59 +0000
3+++ utah/isotest/data/file_list_subiquity 2018-12-18 20:57:09 +0000
4@@ -9,7 +9,6 @@
5 boot/grub
6 casper
7 casper/filesystem.manifest
8-casper/filesystem.manifest-remove
9 casper/filesystem.squashfs
10 casper/filesystem.squashfs.gpg
11 casper/installer.squashfs
12
13=== modified file 'utah/isotest/data/file_list_subiquity_powerpc'
14--- utah/isotest/data/file_list_subiquity_powerpc 2018-02-28 21:36:51 +0000
15+++ utah/isotest/data/file_list_subiquity_powerpc 2018-12-18 20:57:09 +0000
16@@ -7,7 +7,6 @@
17 casper/filesystem.initrd-generic
18 casper/filesystem.kernel-generic
19 casper/filesystem.manifest
20-casper/filesystem.manifest-remove
21 casper/filesystem.squashfs
22 casper/filesystem.squashfs.gpg
23 casper/installer.squashfs
24
25=== modified file 'utah/isotest/iso_static_validation.py'
26--- utah/isotest/iso_static_validation.py 2018-02-28 21:36:51 +0000
27+++ utah/isotest/iso_static_validation.py 2018-12-18 20:57:09 +0000
28@@ -125,7 +125,7 @@
29 else:
30 ubiquity_image = False
31
32-#Set a flag for subiqutiy based images
33+#Set a flag for subiquity based images
34 if st_variant == 'live-server':
35 subiquity_image = True
36 else:

Subscribers

People subscribed via source and target branches