Use udev for getting serial number #63
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
We already depend on udev anyway. See also / fixes: #59
jaypipes
approved these changes
Sep 28, 2018
There was a problem hiding this comment.
Nice work, @jpo-joyent :) Thanks so much for your contribution!
| } | ||
|
|
||
| udevInfo := make(map[string]string) | ||
| for _, udevLine := range strings.Split(string(udevBytes), "\n") { |
There was a problem hiding this comment.
Might be nice to include a code comment that demonstrates what the output of cat /run/udev/data/b{devNo} looks like. That way, future readers of the code in the block below understand what's going on with the strings.SplitN() and HasPrefix() stuff.
There was a problem hiding this comment.
Alternatively, #66
| @@ -74,53 +74,41 @@ func DiskVendor(disk string) string { | |||
| return strings.TrimSpace(string(contents)) | |||
| } | |||
|
|
|||
| func udevInfo(disk string) (map[string]string, error) { | |||
There was a problem hiding this comment.
A short docstring describing what is in the returned map would be cool (future patch, though, not needed in this one)
|
|
||
| // There are two serial number keys, ID_SERIAL and ID_SERIAL_SHORT | ||
| // The non-_SHORT version often duplicates vendor information collected elsewhere, so use _SHORT. | ||
| if path, ok := info["ID_SERIAL_SHORT"]; ok { |
There was a problem hiding this comment.
Might be worth putting "ID_SERIAL_SHORT" into a string const at the top of the file.
|
|
||
| func pathRunUdevData() string { | ||
| return filepath.Join(pathRoot(), "run", "udev", "data") | ||
| } |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
We already depend on udev anyway.
See also / fixes: #59