VMBuilder

Merge lp:~adeuring/vmbuilder/jenkins_kvm-fix-vbox-ostype into lp:~ubuntu-on-ec2/vmbuilder/jenkins_kvm

  1. jenkins_kvm-fix-vbox-ostype
  2. Merge into jenkins_kvm
Proposed by Abel Deuring
Status: Merged
Merge reported by: Abel Deuring
Merged at revision: not available
Proposed branch: lp:~adeuring/vmbuilder/jenkins_kvm-fix-vbox-ostype
Merge into: lp:~ubuntu-on-ec2/vmbuilder/jenkins_kvm
Diff against target: 25 lines (+2/-2)
2 files modified
jenkins/CloudImages_Juju.sh (+1/-1)
jenkins/CloudImages_Vagrant.sh (+1/-1)
To merge this branch: bzr merge lp:~adeuring/vmbuilder/jenkins_kvm-fix-vbox-ostype
Reviewer Review Type Date Requested Status
Dan Watkins (community) Approve
Review via email: mp+233886@code.launchpad.net

Description of the change

As described in bug 1344889, the virtualbox OS type is wrong for 64 bit images. The cause was a simple missing '_' in a varable name.

To post a comment you must log in.
Revision history for this message
Dan Watkins (oddbloke) wrote :

Looks good to me, +1.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'jenkins/CloudImages_Juju.sh'
2--- jenkins/CloudImages_Juju.sh 2014-08-29 23:03:05 +0000
3+++ jenkins/CloudImages_Juju.sh 2014-09-09 08:41:58 +0000
4@@ -70,7 +70,7 @@
5 _vbox_cmd modifyhd --compact ${final_disk}
6
7 dist_v="Ubuntu"
8-[ "${ARCHTYPE}" = "amd64" ] && dist_v="Ubuntu_64"
9+[ "${ARCH_TYPE}" = "amd64" ] && dist_v="Ubuntu_64"
10 _vbox_cmd createvm \
11 --name ${vmname} \
12 --ostype ${dist_v} \
13
14=== modified file 'jenkins/CloudImages_Vagrant.sh'
15--- jenkins/CloudImages_Vagrant.sh 2014-08-20 21:20:27 +0000
16+++ jenkins/CloudImages_Vagrant.sh 2014-09-09 08:41:58 +0000
17@@ -57,7 +57,7 @@
18 _vbox_cmd modifyhd --compact ${final_disk}
19
20 dist_v="Ubuntu"
21-[ "${ARCHTYPE}" = "amd64" ] && dist_v="Ubuntu_64"
22+[ "${ARCH_TYPE}" = "amd64" ] && dist_v="Ubuntu_64"
23 _vbox_cmd createvm \
24 --name ${vmname} \
25 --ostype ${dist_v} \

Subscribers

People subscribed via source and target branches