VMBuilder

Merge lp://staging/~josvaz/vmbuilder/jenkins_kvm+ethx-fixed into lp://staging/~ubuntu-on-ec2/vmbuilder/jenkins_kvm

  1. jenkins_kvm+ethx-fixed
  2. Merge into jenkins_kvm
Proposed by Jose L. VG
Status: Merged
Merged at revision: 772
Proposed branch: lp://staging/~josvaz/vmbuilder/jenkins_kvm+ethx-fixed
Merge into: lp://staging/~ubuntu-on-ec2/vmbuilder/jenkins_kvm
Diff against target: 114 lines (+65/-27)
1 file modified
templates/img-extra-nets.tmpl (+65/-27)
To merge this branch: bzr merge lp://staging/~josvaz/vmbuilder/jenkins_kvm+ethx-fixed
Reviewer Review Type Date Requested Status
Robert C Jennings (community) Approve
Review via email: mp+309486@code.staging.launchpad.net

Description of the change

Fix 768-770 commits adding eth1+ udev support

Commits 768-770 added udev support for eth1+ DHCP configuration for xenial onward.

They had a bug and were reverted. This is a fixed version of those commits. The problem was the xchrooted command at line had an incorrect prefix on, a path already chrooted.

To post a comment you must log in.
Revision history for this message
Jose L. VG (josvaz) wrote :

Lines fixed

91 + # Make the script executable
92 + xchroot chmod +x /usr/local/sbin/ephemeral_eth.sh

Was:

91 + # Make the script executable
92 + xchroot chmod +x ${mp}/usr/local/sbin/ephemeral_eth.sh

Revision history for this message
Robert C Jennings (rcj) wrote :

it would be easier now and for future reviewers to have two commits. Commit #1 re-reverts r771, Commit #2 fixes the issue.

review: Needs Fixing
Revision history for this message
Jose L. VG (josvaz) wrote :

Done, please review again

Revision history for this message
Robert C Jennings (rcj) wrote :

Excellent and thank you for splitting out the fix from the revert. Merge when ready

review: Approve
lp://staging/~josvaz/vmbuilder/jenkins_kvm+ethx-fixed updated
771. By Jose L. VG

Re-reverts 771

772. By Jose L. VG

Fix 768-770 commits adding eth1+ udev support

Commits 768-770 added udev support for eth1+ DHCP configuration for
xenial onward.

They had a bug and were reverted. This is the fix:
The xchrooted command had a prefix on, a path already chrooted!

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches