ToUpstream: Add Sammy's extsd handling
ToUpstream: Add weird whoami output