@yrabbit

I can't remember the ipfw command syntax, but when updating pf, I always do something like:

# service pf restart && (sleep 30 ; service pf stop)

If the new rules didn't lock me out, hitting control-C works to cancel the start. If they locked me out, I get access back 30s later.