d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
Rework script dependencies to allow everything made optional to more optional
This commit is contained in:
Enji Cooper 2014-11-30 06:08:22 +00:00
parent c696ccf200
commit 2b0cb1247a
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/projects/building-blocks/; revision=275300
17 changed files with 50 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
etc/rc.d/Makefile
View File

@ -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

6
etc/rc.d/NETWORKING
View File

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

2
etc/rc.d/bridge
View File

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

2
etc/rc.d/defaultroute
View File

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

2
etc/rc.d/gssd
View File

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

1
etc/rc.d/ipfw
View File

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

2
etc/rc.d/local_unbound
View File

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

2
etc/rc.d/netif
View File

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

2
etc/rc.d/nsswitch
View File

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

1
etc/rc.d/ppp
View File

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

2
etc/rc.d/resolv
View File

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

3
etc/rc.d/route6d
View File

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

3
etc/rc.d/routed
View File

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

2
etc/rc.d/routing
View File

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

2
etc/rc.d/static_arp
View File

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

3
etc/rc.d/static_ndp
View File

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

1
etc/rc.d/stf
View File

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