From owner-p4-projects@FreeBSD.ORG  Tue Oct 25 09:12:51 2005
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 1BEAF16A424; Tue, 25 Oct 2005 09:12:51 +0000 (GMT)
X-Original-To: perforce@freebsd.org
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id BDB2716A41F
	for <perforce@freebsd.org>; Tue, 25 Oct 2005 09:12:50 +0000 (GMT)
	(envelope-from soc-bushman@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 51B4043D4C
	for <perforce@freebsd.org>; Tue, 25 Oct 2005 09:12:50 +0000 (GMT)
	(envelope-from soc-bushman@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j9P9Co79003077
	for <perforce@freebsd.org>; Tue, 25 Oct 2005 09:12:50 GMT
	(envelope-from soc-bushman@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j9P9CnYU003074
	for perforce@freebsd.org; Tue, 25 Oct 2005 09:12:49 GMT
	(envelope-from soc-bushman@freebsd.org)
Date: Tue, 25 Oct 2005 09:12:49 GMT
Message-Id: <200510250912.j9P9CnYU003074@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	soc-bushman@freebsd.org using -f
From: soc-bushman <soc-bushman@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 85821 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 25 Oct 2005 09:12:52 -0000

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

Change 85821 by soc-bushman@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. */