Installation on Raspberry Pi Model B Rev 2 fails

[choksi81]

Seattle fails to install on a Raspberry Pi Model B Revision 2.0. Apparently the installer thinks it's running on a Nokia tablet.

sburnett@raspberrypi ~/seattle $ ./install.sh 
Seattle is being installed on a Nokia N800/900 Internet Tablet.
Please run the installer as root. This can be done by installing/using the rootsh or openssh package.

This seems to be because seattleinstaller.py has platform-specific checks that assume all machine platforms starting with "armv" are Nokia tablets. For example, seattleinsaller.py:1381}} in thesetup_linux_or_mac_startup}} function:

  # Derek Cheng: check to see if Seattle is being installed on a Nokia tablet.
  if platform.machine().startswith('armv'):
    return setup_nokia_startup()

Other locations include seattleinstaller.py:2149 (in the main function) and seattleinstaller.py:2040 (in the test_seattle_is_installed function.

For reference, the machine type of a Raspberry Pi is:

sburnett@raspberrypi ~ $ python -c "import platform; print platform.machine()"
armv6l

If I comment out all Nokia-specific lines (forcing the installer to do a vanilla Linux install) then installation seems to work fine. (Aside from a benchmark error, which I will file another ticket about.)

[choksi81]

Modified Seattle installer, with Nokia-specific checks commented out

[choksi81]

Diff of original and modified seattleinstaller.py

[choksi81]

Can someone with access to a Nokia tablet please let me know a better way to check whether Seattle is running on one? Checking for "armv" in the platform name obviously isn't good enough any more, but I have no idea what other identifying characteristic we could use to identify a Nokia tablet that wouldn't match something else. Perhaps there's something suitable in /proc/cpuinfo, the output of lsusb/lspci, or dmesg?
If someone gives me a clue here, I'm happy to submit a patch.

[choksi81]

This is important. It may block the Stony Brook folks as well.
Let's help Sam with this today.