Merge lp:~xnox/livecd-rootfs/no-more-i386-boxes into lp:livecd-rootfs

Proposed by Dimitri John Ledkov
Status: Merged
Merge reported by: Dimitri John Ledkov
Merged at revision: not available
Proposed branch: lp:~xnox/livecd-rootfs/no-more-i386-boxes
Merge into: lp:livecd-rootfs
Diff against target: 42 lines (+1/-9)
3 files modified
live-build/ubuntu-cpc/hooks/040-vmdk-image.binary (+1/-1)
live-build/ubuntu-cpc/hooks/041-vmdk-ova-image.binary (+0/-4)
live-build/ubuntu-cpc/hooks/042-vagrant.binary (+0/-4)
To merge this branch: bzr merge lp:~xnox/livecd-rootfs/no-more-i386-boxes
Reviewer Review Type Date Requested Status
Canonical Foundations Team Pending
Ubuntu Core Development Team Pending
Review via email: mp+337164@code.launchpad.net
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 'live-build/ubuntu-cpc/hooks/040-vmdk-image.binary'
2--- live-build/ubuntu-cpc/hooks/040-vmdk-image.binary 2017-11-06 12:25:57 +0000
3+++ live-build/ubuntu-cpc/hooks/040-vmdk-image.binary 2018-02-05 15:49:06 +0000
4@@ -4,7 +4,7 @@
5 # Generate VMDK files
6
7 case $ARCH in
8- i386|amd64) ;;
9+ amd64) ;;
10 *) echo "VMDK images are not supported for $ARCH yet.";
11 exit 0;;
12 esac
13
14=== modified file 'live-build/ubuntu-cpc/hooks/041-vmdk-ova-image.binary'
15--- live-build/ubuntu-cpc/hooks/041-vmdk-ova-image.binary 2017-11-06 12:25:57 +0000
16+++ live-build/ubuntu-cpc/hooks/041-vmdk-ova-image.binary 2018-02-05 15:49:06 +0000
17@@ -18,10 +18,6 @@
18 ovf_id=94
19 ovf_os_type="ubuntu64Guest"
20 ovf_desc_bits=64 ;;
21- i386)
22- ovf_id=93
23- ovf_os_type="ubuntu32Guest"
24- ovf_desc_bits=32 ;;
25 *)
26 echo "OVA images are not supported for $ARCH yet.";
27 exit 0;;
28
29=== modified file 'live-build/ubuntu-cpc/hooks/042-vagrant.binary'
30--- live-build/ubuntu-cpc/hooks/042-vagrant.binary 2017-11-06 12:25:57 +0000
31+++ live-build/ubuntu-cpc/hooks/042-vagrant.binary 2018-02-05 15:49:06 +0000
32@@ -35,10 +35,6 @@
33 ovf_id=94
34 ovf_os_type="ubuntu64Guest"
35 ovf_desc_bits=64 ;;
36- i386)
37- ovf_id=93
38- ovf_os_type="ubuntu32Guest"
39- ovf_desc_bits=32 ;;
40 *)
41 echo "Vagrant images are not supported for $ARCH yet."
42 exit 0;;

Subscribers

People subscribed via source and target branches