PERFORCE change 85821 for review

[soc-bushman]

http://perforce.freebsd.org/chv.cgi?CH=85821

Change 85821 by soc-bushman at soc-bushman_stinger on 2005/10/25 09:11:49

	changes integrated

Affected files ...

.. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/powerd/powerd.c#5 integrate

Differences ...

==== //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/powerd/powerd.c#5 (text+ko) ====

@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/usr.sbin/powerd/powerd.c,v 1.15 2005/10/23 00:55:56 njl Exp $");
+__FBSDID("$FreeBSD: src/usr.sbin/powerd/powerd.c,v 1.16 2005/10/24 18:34:54 njl Exp $");
 
 #include <sys/types.h>
 #include <sys/param.h>
@@ -488,9 +488,6 @@
 	signal(SIGTERM, handle_sigs);
 	signal(SIGPIPE, SIG_IGN);
 
-	/* Decide whether to use ACPI or APM to read the AC line status. */
-	acline_init();
-
 	/* Run in the background unless in verbose mode. */
 	if (!vflag) {
 		pid_t otherpid;
@@ -512,6 +509,9 @@
 		pidfile_write(pfh);
 	}
 
+	/* Decide whether to use ACPI or APM to read the AC line status. */
+	acline_init();
+
 	/* Main loop. */
 	for (;;) {
 		/* Check status every few milliseconds. */