* sync the are-we-running-the-right-kernel? code with rc.<whateveritis>
  so that it behaves with a 5.x delay kernel

* modify to support a -r "restart" option so we don't have to invoke twice