VMBuilder

Merge lp:~xnox/vmbuilder/jenkins_kvm into lp:~ubuntu-on-ec2/vmbuilder/jenkins_kvm

  1. jenkins_kvm
  2. Merge into jenkins_kvm
Proposed by Dimitri John Ledkov
Status: Merged
Merged at revision: 790
Proposed branch: lp:~xnox/vmbuilder/jenkins_kvm
Merge into: lp:~ubuntu-on-ec2/vmbuilder/jenkins_kvm
Diff against target: 124 lines (+20/-15)
5 files modified
templates/default.tmpl (+4/-3)
templates/img-azure.tmpl (+4/-3)
templates/img-juju.tmpl (+4/-3)
templates/img-update.tmpl (+4/-3)
templates/img-vagrant.tmpl (+4/-3)
To merge this branch: bzr merge lp:~xnox/vmbuilder/jenkins_kvm
Reviewer Review Type Date Requested Status
Francis Ginther (community) Approve
Dan Watkins (community) Approve
Canonical Foundations Team Pending
Review via email: mp+332084@code.launchpad.net

Description of the change

Entirely untested, as I don't know how.

To post a comment you must log in.
Revision history for this message
Dimitri John Ledkov (xnox) wrote :

Please let me know if there are any other templates/branches to fix.

Revision history for this message
Dan Watkins (oddbloke) wrote :

LGTM

review: Approve
Revision history for this message
Francis Ginther (fginther) wrote :

Approve

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'templates/default.tmpl'
--- templates/default.tmpl 2015-10-21 08:39:50 +0000
+++ templates/default.tmpl 2017-10-10 22:44:58 +0000
@@ -91,8 +91,8 @@
91 chmod 0755 "${mp}/usr/sbin/policy-rc.d" ||91 chmod 0755 "${mp}/usr/sbin/policy-rc.d" ||
92 fail "Unable to make policy-rc.d executable"92 fail "Unable to make policy-rc.d executable"
9393
94 rm "${mp}/etc/resolv.conf" ||94 mv "${mp}/etc/resolv.conf" "${mp}/etc/resolv.conf.orig" ||
95 fail "Unable to remove /etc/resolv.conf"95 fail "Unable to backup /etc/resolv.conf"
9696
97 cp /etc/resolv.conf "${mp}/etc/resolv.conf" &&97 cp /etc/resolv.conf "${mp}/etc/resolv.conf" &&
98 debug "Placed resolv.conf in image" ||98 debug "Placed resolv.conf in image" ||
@@ -123,7 +123,8 @@
123 rm "${mp}/etc/resolv.conf" ||123 rm "${mp}/etc/resolv.conf" ||
124 fail "Failed to remove /etc/resolv.conf"124 fail "Failed to remove /etc/resolv.conf"
125125
126 chroot "${mp}" ln -snf ../run/resolvconf/resolv.conf /etc/resolv.conf126 mv "${mp}/etc/resolv.conf.orig" "${mp}/etc/resolv.conf" ||
127 fail "Unable to revert /etc/resolv.conf"
127}128}
128129
129chroot_mount() {130chroot_mount() {
130131
=== modified file 'templates/img-azure.tmpl'
--- templates/img-azure.tmpl 2017-09-05 11:40:21 +0000
+++ templates/img-azure.tmpl 2017-10-10 22:44:58 +0000
@@ -68,8 +68,8 @@
68 chmod 0755 "${mp}/usr/sbin/policy-rc.d" ||68 chmod 0755 "${mp}/usr/sbin/policy-rc.d" ||
69 fail "Unable to make policy-rc.d executable"69 fail "Unable to make policy-rc.d executable"
7070
71 rm "${mp}/etc/resolv.conf" ||71 mv "${mp}/etc/resolv.conf" "${mp}/etc/resolv.conf.orig" ||
72 fail "Unable to remove /etc/resolv.conf"72 fail "Unable to backup /etc/resolv.conf"
7373
74 cp /etc/resolv.conf "${mp}/etc/resolv.conf" &&74 cp /etc/resolv.conf "${mp}/etc/resolv.conf" &&
75 debug "Placed resolv.conf in image" ||75 debug "Placed resolv.conf in image" ||
@@ -98,7 +98,8 @@
98 rm "${mp}/etc/resolv.conf" ||98 rm "${mp}/etc/resolv.conf" ||
99 fail "Failed to remove /etc/resolv.conf"99 fail "Failed to remove /etc/resolv.conf"
100100
101 chroot "${mp}" ln -snf ../run/resolvconf/resolv.conf /etc/resolv.conf101 mv "${mp}/etc/resolv.conf.orig" "${mp}/etc/resolv.conf" ||
102 fail "Unable to revert /etc/resolv.conf"
102}103}
103104
104build_chroot() {105build_chroot() {
105106
=== modified file 'templates/img-juju.tmpl'
--- templates/img-juju.tmpl 2015-09-24 21:05:42 +0000
+++ templates/img-juju.tmpl 2017-10-10 22:44:58 +0000
@@ -50,8 +50,8 @@
50 chmod 0755 "${mp}/usr/sbin/policy-rc.d" ||50 chmod 0755 "${mp}/usr/sbin/policy-rc.d" ||
51 fail "Unable to make policy-rc.d executable"51 fail "Unable to make policy-rc.d executable"
5252
53 rm "${mp}/etc/resolv.conf" ||53 mv "${mp}/etc/resolv.conf" "${mp}/etc/resolv.conf.orig" ||
54 fail "Unable to remove /etc/resolv.conf"54 fail "Unable to backup /etc/resolv.conf"
5555
56 cp /etc/resolv.conf "${mp}/etc/resolv.conf" &&56 cp /etc/resolv.conf "${mp}/etc/resolv.conf" &&
57 debug "Placed resolv.conf in image" ||57 debug "Placed resolv.conf in image" ||
@@ -80,7 +80,8 @@
80 rm "${mp}/etc/resolv.conf" ||80 rm "${mp}/etc/resolv.conf" ||
81 fail "Failed to remove /etc/resolv.conf"81 fail "Failed to remove /etc/resolv.conf"
8282
83 chroot "${mp}" ln -snf ../run/resolvconf/resolv.conf /etc/resolv.conf83 mv "${mp}/etc/resolv.conf.orig" "${mp}/etc/resolv.conf" ||
84 fail "Unable to revert /etc/resolv.conf"
84}85}
8586
86build_chroot() {87build_chroot() {
8788
=== modified file 'templates/img-update.tmpl'
--- templates/img-update.tmpl 2016-09-20 15:41:42 +0000
+++ templates/img-update.tmpl 2017-10-10 22:44:58 +0000
@@ -79,8 +79,8 @@
79 chmod 0755 "${mp}/usr/sbin/policy-rc.d" ||79 chmod 0755 "${mp}/usr/sbin/policy-rc.d" ||
80 fail "Unable to make policy-rc.d executable"80 fail "Unable to make policy-rc.d executable"
8181
82 rm "${mp}/etc/resolv.conf" ||82 mv "${mp}/etc/resolv.conf" "${mp}/etc/resolv.conf.orig" ||
83 fail "Unable to remove /etc/resolv.conf"83 fail "Unable to backup /etc/resolv.conf"
8484
85 cp /etc/resolv.conf "${mp}/etc/resolv.conf" &&85 cp /etc/resolv.conf "${mp}/etc/resolv.conf" &&
86 debug "Placed resolv.conf in image" ||86 debug "Placed resolv.conf in image" ||
@@ -109,7 +109,8 @@
109 rm "${mp}/etc/resolv.conf" ||109 rm "${mp}/etc/resolv.conf" ||
110 fail "Failed to remove /etc/resolv.conf"110 fail "Failed to remove /etc/resolv.conf"
111111
112 chroot "${mp}" ln -snf ../run/resolvconf/resolv.conf /etc/resolv.conf112 mv "${mp}/etc/resolv.conf.orig" "${mp}/etc/resolv.conf" ||
113 fail "Unable to revert /etc/resolv.conf"
113}114}
114115
115build_chroot() {116build_chroot() {
116117
=== modified file 'templates/img-vagrant.tmpl'
--- templates/img-vagrant.tmpl 2014-11-07 15:49:08 +0000
+++ templates/img-vagrant.tmpl 2017-10-10 22:44:58 +0000
@@ -52,8 +52,8 @@
52 chmod 0755 "${mp}/usr/sbin/policy-rc.d" ||52 chmod 0755 "${mp}/usr/sbin/policy-rc.d" ||
53 fail "Unable to make policy-rc.d executable"53 fail "Unable to make policy-rc.d executable"
5454
55 rm "${mp}/etc/resolv.conf" ||55 mv "${mp}/etc/resolv.conf" "${mp}/etc/resolv.conf.orig" ||
56 fail "Unable to remove /etc/resolv.conf"56 fail "Unable to backup /etc/resolv.conf"
5757
58 cp /etc/resolv.conf "${mp}/etc/resolv.conf" &&58 cp /etc/resolv.conf "${mp}/etc/resolv.conf" &&
59 debug "Placed resolv.conf in image" ||59 debug "Placed resolv.conf in image" ||
@@ -82,7 +82,8 @@
82 rm "${mp}/etc/resolv.conf" ||82 rm "${mp}/etc/resolv.conf" ||
83 fail "Failed to remove /etc/resolv.conf"83 fail "Failed to remove /etc/resolv.conf"
8484
85 chroot "${mp}" ln -snf ../run/resolvconf/resolv.conf /etc/resolv.conf85 mv "${mp}/etc/resolv.conf.orig" "${mp}/etc/resolv.conf" ||
86 fail "Unable to revert /etc/resolv.conf"
86}87}
8788
88build_chroot() {89build_chroot() {

Subscribers

People subscribed via source and target branches