Merge changes I3b20be28,I7118025c

* changes:
  Revert "init: disable oneshot_on test"
  init: require root for oneshot_on test