Fill in MK_ACPI, (MK_ACPI && MK_APM), MK_INET6, MK_PPP, and MK_ROUTED

Rework script dependencies to allow everything made optional to more optional

etc/rc.d/Makefile

@@ -40,7 +40,6 @@ FILES=	DAEMON \
 	hostid_save \
 	hostname \
 	${_inetd} \
-	ip6addrctl \
 	ipfilter \
 	ipfs \
 	ipfw \
@@ -65,8 +64,6 @@ FILES=	DAEMON \
 	mdconfig \
 	mdconfig2 \
 	mountd \
-	mroute6d \
-	mrouted \
 	msgs \
 	natd \
 	netif \
@@ -82,34 +79,21 @@ FILES=	DAEMON \
 	pf \
 	pflog \
 	pfsync \
-	powerd \
-	power_profile \
-	ppp \
-	pppoed \
 	pwcheck \
 	quota \
 	random \
 	rarpd \
 	rctl \
 	resolv \
-	rfcomm_pppd_server \
 	root \
-	route6d \
-	routed \
 	routing \
 	rpcbind \
-	rtadvd \
-	rtsold \
 	savecore \
-	sdpd \
 	securelevel \
 	serial \
-	sppp \
 	${_sshd} \
 	statd \
 	static_arp \
-	static_ndp \
-	stf \
 	swap \
 	swaplate \
 	sysctl \
@@ -132,6 +116,14 @@ FILES=	DAEMON \
 FILES+=	accounting
 .endif
 
+.if ${MK_ACPI} != "no"
+FILES+=		power_profile
+.endif
+
+.if ${MK_ACPI} != "no" || ${MK_APM} != "no"
+FILES+=		powerd
+.endif
+
 .if ${MK_AMD} != "no"
 FILES+=	amd
 .endif
@@ -162,6 +154,8 @@ FILES+=	autounmountd
 _bluetooth=	bluetooth
 _bthidd=	bthidd
 _hcsecd=	hcsecd
+FILES+=		rfcomm_pppd_server
+FILES+=		sdpd
 _ubthidhci=	ubthidhci
 .endif
 
@@ -197,6 +191,16 @@ FILES+=		hastd
 _inetd=		inetd
 .endif
 
+.if ${MK_INET6} != "no"
+FILES+=		ip6addrctl
+FILES+=		mroute6d
+FILES+=		route6d
+FILES+=		stf
+FILES+=		rtadvd
+FILES+=		rtsold
+FILES+=		static_ndp
+.endif
+
 .if ${MK_ISCSI} != "no"
 FILES+=	iscsictl
 FILES+=	iscsid
@@ -259,10 +263,20 @@ _sshd=		sshd
 FILES+=		ftp-proxy
 .endif
 
+.if ${MK_PPP} != "no"
+FILES+=		ppp
+FILES+=		pppoed
+FILES+=		sppp
+.endif
+
 .if ${MK_RCMDS} != "no"
 FILES+=		rwho
 .endif
 
+.if ${MK_ROUTED} != "no"
+FILES+=		routed
+.endif
+
 .if ${MK_SENDMAIL} != "no"
 FILES+=		sendmail
 .endif

etc/rc.d/NETWORKING

@@ -4,9 +4,9 @@
 #
 
 # PROVIDE: NETWORKING NETWORK
-# REQUIRE: netif netoptions routing ppp ipfw stf
+# REQUIRE: netif netoptions routing ipfw
-# REQUIRE: defaultroute routed mrouted route6d mroute6d resolv bridge
+# REQUIRE: defaultroute resolv bridge
-# REQUIRE: static_arp static_ndp
+# REQUIRE: static_arp
 
 #	This is a dummy dependency, for services which require networking
 #	to be operational before starting.

etc/rc.d/bridge

@@ -26,7 +26,7 @@
 #
 
 # PROVIDE: bridge
-# REQUIRE: netif ppp stf
+# REQUIRE: netif
 # KEYWORD: nojail
 
 . /etc/rc.subr

etc/rc.d/defaultroute

@@ -6,7 +6,7 @@
 #
 
 # PROVIDE: defaultroute
-# REQUIRE: devd netif stf
+# REQUIRE: devd netif
 # KEYWORD: nojail
 
 . /etc/rc.subr

etc/rc.d/gssd

@@ -5,7 +5,7 @@
 
 # PROVIDE: gssd
 # REQUIRE: root
-# BEFORE: nfsd
+# BEFORE: nfsd nfsuserd
 # KEYWORD: nojail shutdown
 
 . /etc/rc.subr

etc/rc.d/ipfw

@@ -4,7 +4,6 @@
 #
 
 # PROVIDE: ipfw
-# REQUIRE: ppp
 # KEYWORD: nojailvnet
 
 . /etc/rc.subr

etc/rc.d/local_unbound

@@ -4,7 +4,7 @@
 #
 
 # PROVIDE: local_unbound
-# REQUIRE: FILESYSTEMS netif resolv
+# REQUIRE: FILESYSTEMS netif resolv routing
 # BEFORE: NETWORKING
 # KEYWORD: shutdown
 

etc/rc.d/netif

@@ -26,7 +26,7 @@
 #
 
 # PROVIDE: netif
-# REQUIRE: FILESYSTEMS serial sppp sysctl
+# REQUIRE: FILESYSTEMS serial sysctl
 # REQUIRE: ipfilter ipfs
 # KEYWORD: nojailvnet
 

etc/rc.d/nsswitch

@@ -27,7 +27,7 @@
 #
 
 # PROVIDE: nsswitch
-# REQUIRE: root
+# REQUIRE: root routing
 # BEFORE:  NETWORK
 
 . /etc/rc.subr

etc/rc.d/ppp

@@ -5,6 +5,7 @@
 
 # PROVIDE: ppp
 # REQUIRE: netif
+# BEFORE: bridge ipfw routing
 # KEYWORD: nojail
 
 . /etc/rc.subr

etc/rc.d/resolv

@@ -28,7 +28,7 @@
 #
 
 # PROVIDE: resolv
-# REQUIRE: netif FILESYSTEMS
+# REQUIRE: netif FILESYSTEMS routing
 # KEYWORD: nojail
 
 . /etc/rc.subr

etc/rc.d/route6d

@@ -4,7 +4,8 @@
 #
 
 # PROVIDE: route6d
-# REQUIRE: netif routing
+# REQUIRE: bridge netif routing
+# BEFORE: NETWORKING
 # KEYWORD: nojail
 
 . /etc/rc.subr

etc/rc.d/routed

@@ -4,7 +4,8 @@
 #
 
 # PROVIDE: routed
-# REQUIRE: netif routing
+# REQUIRE: bridge netif routing
+# BEFORE: NETWORKING
 # KEYWORD: nojail
 
 . /etc/rc.subr

etc/rc.d/routing

@@ -6,7 +6,7 @@
 #
 
 # PROVIDE: routing
-# REQUIRE: netif ppp stf
+# REQUIRE: netif
 # KEYWORD: nojailvnet
 
 . /etc/rc.subr

etc/rc.d/static_arp

@@ -30,7 +30,7 @@
 #
 
 # PROVIDE: static_arp
-# REQUIRE: netif
+# REQUIRE: netif routing
 # KEYWORD: nojail
 
 . /etc/rc.subr

etc/rc.d/static_ndp

@@ -30,7 +30,8 @@
 #
 
 # PROVIDE: static_ndp
-# REQUIRE: netif
+# REQUIRE: netif routing
+# BEFORE: NETWORKING
 # KEYWORD: nojail
 
 . /etc/rc.subr

etc/rc.d/stf

@@ -4,6 +4,7 @@
 
 # PROVIDE: stf
 # REQUIRE: netif
+# BEFORE: bridge defaultroute NETWORKING routing
 # KEYWORD: nojail
 
 . /etc/rc.subr