PERFORCE change 80865 for review

[soc-tyler]

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

Change 80865 by soc-tyler at 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) ====