PPPoE updates: don't exit if discovery fails, cope with both