Skip to content

Make machine-id sources flag a comma-separated list.#561

Merged
vmarmol merged 1 commit into
google:masterfrom
rjnagal:rename
Mar 5, 2015
Merged

Make machine-id sources flag a comma-separated list.#561
vmarmol merged 1 commit into
google:masterfrom
rjnagal:rename

Conversation

@rjnagal

@rjnagal rjnagal commented Mar 4, 2015

Copy link
Copy Markdown
Contributor

Use "/etc/machine-id,/var/lib/dbus/machine-id" as default.

Comment thread manager/machine.go

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nit: Why not report an error instead of info?

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I am not sure if we have machine-id on all distro. It might be expected to fail on some hosts.

@vishh

vishh commented Mar 4, 2015

Copy link
Copy Markdown
Contributor

LGTM. The e2e tests are failing on CoreOS.

@vmarmol

vmarmol commented Mar 4, 2015

Copy link
Copy Markdown
Contributor

LGTM

Use "/etc/machine-id,/var/lib/dbus/machine-id" as default.
@rjnagal

rjnagal commented Mar 5, 2015

Copy link
Copy Markdown
Contributor Author

e2e test seems to be flaky. Running it again fixed it.

@vmarmol

vmarmol commented Mar 5, 2015

Copy link
Copy Markdown
Contributor

Grrr need to tackle the flakes. LGTM

vmarmol added a commit that referenced this pull request Mar 5, 2015
Make machine-id sources flag a comma-separated list.
@vmarmol vmarmol merged commit d94f936 into google:master Mar 5, 2015
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants