pg_upgrade fails for non-postgres user

I just tried doing pg_upgrade on a database when logged in as user
"mha" rather than "postgres" on my system. And it failed. Even though
the db was initialized with superuser "mha". The reason for this was
that pg_upgrade tried to connect to the database "mha" (hardcoded to
be the db username), and that certainly didn't exist.

When that was fixed, I realized the psql command to create the
datanbases connect to database "template1" only to immediately switch
to database "postgres", which also seems rather pointless.

Attach patch makes it connect to the "postgres" database instead of
$USER, and then also changes the psql command to actually use it.

I know way too little about pg_upgrade to tell if this is fully safe,
but it does fix the problem in my installation.

--
 Magnus Hagander
 Me: http://www.hagander.net/
 Work: http://www.redpill-linpro.com/