factory: change to starting after all services

udev-addon is going away; the correct place for this job to be started
is "started system-services" which means the absolute completion of
boot, with everything that means already implied.

Since we're using this state job, we can use "stopping system-services"
instead of halt/reboot too.

And we can make factorylog only refer to factory.

BUG=chromium-os:16079
TEST=none

Change-Id: I576ad88317120f5703ae0b216a9a59b256037ea1
Reviewed-on: http://gerrit.chromium.org/gerrit/2318
Reviewed-by: Doug Anderson <dianders@chromium.org>
Reviewed-by: Nick Sanders <nsanders@chromium.org>
Tested-by: Scott James Remnant <keybuk@chromium.org>
diff --git a/factory.conf b/factory.conf
index e3c7e3e..75789fc 100644
--- a/factory.conf
+++ b/factory.conf
@@ -5,8 +5,8 @@
 description   "Chrome OS factory startup stub"
 author        "chromium-os-dev@chromium.org"
 
-start on stopped udev-addon
-stop on starting halt or starting reboot
+start on started system-services
+stop on stopping system-services
 
 script
   modprobe i2c-dev
diff --git a/factorylog.conf b/factorylog.conf
index 14fd304..e08c909 100644
--- a/factorylog.conf
+++ b/factorylog.conf
@@ -6,7 +6,7 @@
 author        "chromium-os-dev@chromium.org"
 
 start on started factory
-stop on starting halt or starting reboot
+stop on stopping factory
 
 respawn
 script