From owner-p4-projects@FreeBSD.ORG  Sat Jul 23 15:48:37 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 81D9116A421; Sat, 23 Jul 2005 15:48:37 +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 5D59416A41F
	for <perforce@freebsd.org>; Sat, 23 Jul 2005 15:48:37 +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 2D4D143D48
	for <perforce@freebsd.org>; Sat, 23 Jul 2005 15:48:37 +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 j6NFmbGn021034
	for <perforce@freebsd.org>; Sat, 23 Jul 2005 15:48:37 GMT
	(envelope-from soc-tyler@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j6NFmaVL021031
	for perforce@freebsd.org; Sat, 23 Jul 2005 15:48:36 GMT
	(envelope-from soc-tyler@freebsd.org)
Date: Sat, 23 Jul 2005 15:48:36 GMT
Message-Id: <200507231548.j6NFmaVL021031@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 80865 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: Sat, 23 Jul 2005 15:48:38 -0000

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

Change 80865 by soc-tyler@soc-tyler_launchd on 2005/07/23 15:47:38

	launchd(8) should also be able to *not* be PID 1

Affected files ...

.. //depot/projects/soc2005/launchd/Makefile#8 edit
.. //depot/projects/soc2005/launchd/init.c#6 edit
.. //depot/projects/soc2005/launchd/launchd.c#7 edit

Differences ...

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

@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PROG=	launchd
-SRCS=	launchd.c liblaunch.c init.c
+SRCS=	launchd.c liblaunch.c ##init.c
 #launchdebugd.c launchproxy.c
 MAN=	launchd.conf.5 launchd.plist.5 init.8 launchd.8 \
 	launchd_debug.8 launchproxy.8 rc.8 service.8 
@@ -11,9 +11,13 @@
 INSTALLFLAGS=-b -B.bak
 NO_SHARED?=	YES
 
+
 CFLAGS+= -g -Wall -W -Wshadow -Wpadded -Iincludes -D_LAUNCHD_
-## init.c related CFLAGS
+# init.c related CFLAGS (from src/sbin/init/Makefile)
 CFLAGS+= -DDEBUGSHELL -DSECURE -DLOGIN_CAP -DCOMPAT_SYSV_INIT
+# Do not let launchd(8) have init(8) functionality (or I haven't implemented it yet.. ;))
+CFLAGS+= -D_NO_INIT_
+
 
 # -lcrypt needed by original FreeBSD init(8) code
 DPADD=	${LIBUTIL} ${LIBCRYPT}

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


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