Merge lp:~daniel-thewatkins/vmbuilder/automated-ec2-builds into lp:~ubuntu-on-ec2/vmbuilder/automated-ec2-builds

Proposed by Dan Watkins on 2017-12-08
Status: Merged
Merged at revision: 734
Proposed branch: lp:~daniel-thewatkins/vmbuilder/automated-ec2-builds
Merge into: lp:~ubuntu-on-ec2/vmbuilder/automated-ec2-builds
Diff against target: 11 lines (+7/-0)
1 file modified
live-config/common/hooks/070-clear-machine-id.chroot (+7/-0)
To merge this branch: bzr merge lp:~daniel-thewatkins/vmbuilder/automated-ec2-builds
Reviewer Review Type Date Requested Status
Francis Ginther 2017-12-08 Approve on 2017-12-08
Philip Roche 2017-12-08 Approve on 2017-12-08
Review via email: mp+334980@code.launchpad.net
To post a comment you must log in.
Dan Watkins (daniel-thewatkins) wrote :

I've tested this in a VM, and seen images without /var/lib/dbus/machine-id built.

Philip Roche (philroche) wrote :

+1

review: Approve
Francis Ginther (fginther) wrote :

This should work.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== added file 'live-config/common/hooks/070-clear-machine-id.chroot'
2--- live-config/common/hooks/070-clear-machine-id.chroot 1970-01-01 00:00:00 +0000
3+++ live-config/common/hooks/070-clear-machine-id.chroot 2017-12-08 16:22:15 +0000
4@@ -0,0 +1,7 @@
5+#!/bin/sh -eux
6+
7+# machine-id should be generated on first boot of each instance, so we clear it
8+# out here. See https://bugs.launchpad.net/cloud-images/+bug/1731279 for more
9+# info.
10+
11+rm /var/lib/dbus/machine-id

Subscribers

People subscribed via source and target branches