From owner-p4-projects@FreeBSD.ORG  Tue Nov  1 10:45:54 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 8BDDE16A421; Tue,  1 Nov 2005 10:45:53 +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 62CA316A41F
	for <perforce@freebsd.org>; Tue,  1 Nov 2005 10:45:53 +0000 (GMT)
	(envelope-from soc-tyler@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id EC51643D49
	for <perforce@freebsd.org>; Tue,  1 Nov 2005 10:45:52 +0000 (GMT)
	(envelope-from soc-tyler@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 jA1AjqXw043861
	for <perforce@freebsd.org>; Tue, 1 Nov 2005 10:45:52 GMT
	(envelope-from soc-tyler@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id jA1Ajq4x043858
	for perforce@freebsd.org; Tue, 1 Nov 2005 10:45:52 GMT
	(envelope-from soc-tyler@freebsd.org)
Date: Tue, 1 Nov 2005 10:45:52 GMT
Message-Id: <200511011045.jA1Ajq4x043858@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	soc-tyler@freebsd.org using -f
From: soc-tyler <soc-tyler@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 86163 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, 01 Nov 2005 10:45:54 -0000

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

Change 86163 by soc-tyler@soc-tyler_launchd on 2005/11/01 10:45:06

	Assuming PID 1 has been bumped down on the priority list.
	
	Might as well not build that nonsense into launchd(8)

Affected files ...

.. //depot/projects/soc2005/launchd/Makefile#22 edit
.. //depot/projects/soc2005/launchd/launchd.c#26 edit

Differences ...

==== //depot/projects/soc2005/launchd/Makefile#22 (text+ko) ====

@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PROG=	launchd
-SRCS=	launchd.c liblaunch.c init.c
+SRCS=	launchd.c liblaunch.c launchd_unix_ipc.c launchd_core_logic.c init.c
 #launchdebugd.c launchproxy.c
 MAN=	launchd.8 
 
@@ -11,11 +11,11 @@
 NO_SHARED?=	YES
 
 
-CFLAGS+= -g -Wall -W -Wshadow -Wpadded -Iincludes
+CFLAGS+= -g -Wall -Iincludes
 # init.c related CFLAGS (from src/sbin/init/Makefile)
 # -DSECURE to make secure single-user logins (enter root passwd, etc)
 # -DDEBUGSHELL ? we don't need no stinkin' DEBUGSHELL
-CFLAGS+= -DLOGIN_CAP -DCOMPAT_SYSV_INIT -D_BE_INIT_ \
+CFLAGS+= -DLOGIN_CAP -DCOMPAT_SYSV_INIT \
 	-DLAUNCHD_PATH=`echo \"$$PWD/launchd\"` \
 	-DLAUNCHCTL_PATH=`echo \"$$PWD/launchctl/launchctl\"`
 # defining LAUNCHD_PATH and LAUNCHCTL_PATH is for development only

==== //depot/projects/soc2005/launchd/launchd.c#26 (text+ko) ====

@@ -731,9 +731,11 @@
 	launchd_assumes(close(s6) == 0);
 }
 
+/* this is a workaround for an openfirmware bug */
 void
 workaround3048875(int argc, char *argv[])
 {
+#ifdef _BUILD_DARWIN_
 	int i;
 	char **ap, *newargv[100], *p = argv[1];
 
@@ -754,6 +756,7 @@
 		return;
 
 	execv(newargv[0], newargv);
+#endif
 }
 
 #ifdef _BUILD_DARWIN_