livecd-rootfs

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

  1. no-more-i386-boxes
  2. Merge into trunk
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
=== modified file 'live-build/ubuntu-cpc/hooks/040-vmdk-image.binary'
--- live-build/ubuntu-cpc/hooks/040-vmdk-image.binary 2017-11-06 12:25:57 +0000
+++ live-build/ubuntu-cpc/hooks/040-vmdk-image.binary 2018-02-05 15:49:06 +0000
@@ -4,7 +4,7 @@
4# Generate VMDK files4# Generate VMDK files
55
6case $ARCH in6case $ARCH in
7 i386|amd64) ;;7 amd64) ;;
8 *) echo "VMDK images are not supported for $ARCH yet.";8 *) echo "VMDK images are not supported for $ARCH yet.";
9 exit 0;;9 exit 0;;
10esac10esac
1111
=== modified file 'live-build/ubuntu-cpc/hooks/041-vmdk-ova-image.binary'
--- live-build/ubuntu-cpc/hooks/041-vmdk-ova-image.binary 2017-11-06 12:25:57 +0000
+++ live-build/ubuntu-cpc/hooks/041-vmdk-ova-image.binary 2018-02-05 15:49:06 +0000
@@ -18,10 +18,6 @@
18 ovf_id=9418 ovf_id=94
19 ovf_os_type="ubuntu64Guest"19 ovf_os_type="ubuntu64Guest"
20 ovf_desc_bits=64 ;;20 ovf_desc_bits=64 ;;
21 i386)
22 ovf_id=93
23 ovf_os_type="ubuntu32Guest"
24 ovf_desc_bits=32 ;;
25 *)21 *)
26 echo "OVA images are not supported for $ARCH yet.";22 echo "OVA images are not supported for $ARCH yet.";
27 exit 0;;23 exit 0;;
2824
=== modified file 'live-build/ubuntu-cpc/hooks/042-vagrant.binary'
--- live-build/ubuntu-cpc/hooks/042-vagrant.binary 2017-11-06 12:25:57 +0000
+++ live-build/ubuntu-cpc/hooks/042-vagrant.binary 2018-02-05 15:49:06 +0000
@@ -35,10 +35,6 @@
35 ovf_id=9435 ovf_id=94
36 ovf_os_type="ubuntu64Guest"36 ovf_os_type="ubuntu64Guest"
37 ovf_desc_bits=64 ;;37 ovf_desc_bits=64 ;;
38 i386)
39 ovf_id=93
40 ovf_os_type="ubuntu32Guest"
41 ovf_desc_bits=32 ;;
42 *)38 *)
43 echo "Vagrant images are not supported for $ARCH yet."39 echo "Vagrant images are not supported for $ARCH yet."
44 exit 0;;40 exit 0;;

Subscribers

People subscribed via source and target branches