Get the proper serial number for device enrollment.

Get the proper serial number for device enrollment.

BUG=chromium-os:18198
TEST=Enroll a device and check the serial number it sends.
Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=94697

[Mattias Nissler (ping if slow), 2011-07-28 22:12:32]

This is the backported serial number fix for M13. Please review!

[Louis, 2011-07-29 02:52:05]

Thanks for doing this. See my 2 cents inline. Sorry that I didn't find the CL
for ToT so I put my comment in this cherrypick.

http://codereview.chromium.org/7493063/diff/1/chrome/browser/policy/device_po...
File chrome/browser/policy/device_policy_identity_strategy.cc (right):

http://codereview.chromium.org/7493063/diff/1/chrome/browser/policy/device_po...
chrome/browser/policy/device_policy_identity_strategy.cc:35: "serial_number"  //
VPD v2+ devices
I'd like to suggest to re-order the list. Try "serial_number" first (because it
is the official name in the future), then "sn" and "Product_S/N".

By the way, we are going to show VPD 1.0 structure in the vpd_2.0.txt too
(http://gerrit.chromium.org/gerrit/4552
) so that you may add "Product_SN" for CR-48.

[Mattias Nissler (ping if slow), 2011-07-29 09:19:52]

http://codereview.chromium.org/7493063/diff/1/chrome/browser/policy/device_po...
File chrome/browser/policy/device_policy_identity_strategy.cc (right):

http://codereview.chromium.org/7493063/diff/1/chrome/browser/policy/device_po...
chrome/browser/policy/device_policy_identity_strategy.cc:35: "serial_number"  //
VPD v2+ devices
On 2011/07/29 02:52:05, Louis wrote:
> I'd like to suggest to re-order the list. Try "serial_number" first (because
it
> is the official name in the future), then "sn" and "Product_S/N".

That's unfortunately not possible due to the name clash mentioned in the comment
above. The information we access through GetMachineStatistic not only comes from
VPD, but also other sources. One of them is the mosys output, which also
includes a "serial_number" field. Making "serial_number" the first choice would
result in the value from mosys being used in case the VPD doesn't give us one,
which is not what we want.

> 
> By the way, we are going to show VPD 1.0 structure in the vpd_2.0.txt too
> (http://gerrit.chromium.org/gerrit/4552
> ) so that you may add "Product_SN" for CR-48.

OK, I guess this is only relevant once that support has landed? Let's make that
change on ToT then.

[Mattias Nissler (ping if slow), 2011-07-29 14:36:15]

Julian, can I get a quote on this?

[pastarmovj, 2011-07-29 15:08:55]

LGTM.

[Louis, 2011-08-01 08:18:11]

http://codereview.chromium.org/7493063/diff/1/chrome/browser/policy/device_po...
File chrome/browser/policy/device_policy_identity_strategy.cc (right):

http://codereview.chromium.org/7493063/diff/1/chrome/browser/policy/device_po...
chrome/browser/policy/device_policy_identity_strategy.cc:35: "serial_number"  //
VPD v2+ devices
On 2011/07/29 09:19:52, Mattias Nissler wrote:
> On 2011/07/29 02:52:05, Louis wrote:
> > I'd like to suggest to re-order the list. Try "serial_number" first (because
> it
> > is the official name in the future), then "sn" and "Product_S/N".
> 
> That's unfortunately not possible due to the name clash mentioned in the
comment
> above. The information we access through GetMachineStatistic not only comes
from
> VPD, but also other sources. One of them is the mosys output, which also
> includes a "serial_number" field. Making "serial_number" the first choice
would
> result in the value from mosys being used in case the VPD doesn't give us one,
> which is not what we want.
What argument do you use for mosys? Does its serial_number mean the same thing?
> 
> > 
> > By the way, we are going to show VPD 1.0 structure in the vpd_2.0.txt too
> > (http://gerrit.chromium.org/gerrit/4552
> > ) so that you may add "Product_SN" for CR-48.
> 
> OK, I guess this is only relevant once that support has landed? Let's make
that
> change on ToT then.
FYI. I've committed in that code.

[Mattias Nissler (ping if slow), 2011-08-01 08:31:17]

http://codereview.chromium.org/7493063/diff/1/chrome/browser/policy/device_po...
File chrome/browser/policy/device_policy_identity_strategy.cc (right):

http://codereview.chromium.org/7493063/diff/1/chrome/browser/policy/device_po...
chrome/browser/policy/device_policy_identity_strategy.cc:35: "serial_number"  //
VPD v2+ devices
On 2011/08/01 08:18:11, Louis wrote:
> On 2011/07/29 09:19:52, Mattias Nissler wrote:
> > On 2011/07/29 02:52:05, Louis wrote:
> > > I'd like to suggest to re-order the list. Try "serial_number" first
(because
> > it
> > > is the official name in the future), then "sn" and "Product_S/N".
> > 
> > That's unfortunately not possible due to the name clash mentioned in the
> comment
> > above. The information we access through GetMachineStatistic not only comes
> from
> > VPD, but also other sources. One of them is the mosys output, which also
> > includes a "serial_number" field. Making "serial_number" the first choice
> would
> > result in the value from mosys being used in case the VPD doesn't give us
one,
> > which is not what we want.
> What argument do you use for mosys? Does its serial_number mean the same
thing?

/sbin/chromeos_startup does this:

mosys -k smbios info system

Which dumps a serial_number that is different from the one we get from VPD, and,
what's worse, not actually machine-specific (all the Alex devices I tested on
returned the same serial number string).

> > 
> > > 
> > > By the way, we are going to show VPD 1.0 structure in the vpd_2.0.txt too
> > > (http://gerrit.chromium.org/gerrit/4552
> > > ) so that you may add "Product_SN" for CR-48.
> > 
> > OK, I guess this is only relevant once that support has landed? Let's make
> that
> > change on ToT then.
> FYI. I've committed in that code.
> 

Thanks, I'll add "Product_SN" to the list then.