Author: pjd
Date: Thu Dec 15 21:06:37 2011
New Revision: 228541
URL: http://svn.freebsd.org/changeset/base/228541
Log:
- Put one file into one line. This makes keeping local changes and merging
with FreeBSD easier for vendors.
- For optional files use variables starting with underscore.
Both changes make rc.d/Makefile look similar to sys/modules/Makefile.
Reviewed by: dim
Modified:
head/etc/rc.d/Makefile
Modified: head/etc/rc.d/Makefile
==============================================================================
--- head/etc/rc.d/Makefile Thu Dec 15 20:40:11 2011 (r228540)
+++ head/etc/rc.d/Makefile Thu Dec 15 21:06:37 2011 (r228541)
@@ -2,64 +2,179 @@
.include <bsd.own.mk>
-FILES= DAEMON FILESYSTEMS LOGIN NETWORKING SERVERS \
- abi accounting addswap adjkerntz amd \
- apm apmd archdep atm1 atm2 atm3 auditd \
- bgfsck bluetooth bootparams bridge bsnmpd bthidd \
- ccd cleanvar cleartmp cron \
- ddb defaultroute devd devfs dhclient \
- dmesg dumpon \
+FILES= DAEMON \
+ FILESYSTEMS \
+ LOGIN \
+ NETWORKING \
+ SERVERS \
+ abi \
+ accounting \
+ addswap \
+ adjkerntz \
+ amd \
+ apm \
+ apmd \
+ archdep \
+ atm1 \
+ atm2 \
+ atm3 \
+ auditd \
+ bgfsck \
+ bluetooth \
+ bootparams \
+ bridge \
+ bsnmpd \
+ bthidd \
+ ccd \
+ cleanvar \
+ cleartmp \
+ cron \
+ ddb \
+ defaultroute \
+ devd \
+ devfs \
+ dhclient \
+ dmesg \
+ dumpon \
encswap \
- faith fsck ftp-proxy ftpd \
- gbde geli geli2 gptboot gssd \
- hastd hcsecd \
- hostapd hostid hostid_save hostname \
- inetd initrandom \
- ip6addrctl ipfilter ipfs ipfw ipmon \
- ipnat ipsec \
+ faith \
+ fsck \
+ ftp-proxy \
+ ftpd \
+ gbde \
+ geli \
+ geli2 \
+ gptboot \
+ gssd \
+ hastd \
+ hcsecd \
+ hostapd \
+ hostid \
+ hostid_save \
+ hostname \
+ inetd \
+ initrandom \
+ ip6addrctl \
+ ipfilter \
+ ipfs \
+ ipfw \
+ ipmon \
+ ipnat \
+ ipsec \
+ ${_ipxrouted} \
jail \
- kadmind kerberos keyserv kld kldxref kpasswdd \
- ldconfig local localpkg lockd lpd \
- mixer motd mountcritlocal mountcritremote mountlate \
- mdconfig mdconfig2 mountd moused mroute6d mrouted msgs \
- named natd netif netoptions netwait \
- newsyslog nfsclient nfscbd nfsd \
- nfsuserd nisdomain nsswitch ntpd ntpdate \
+ kadmind \
+ kerberos \
+ keyserv \
+ kld \
+ kldxref \
+ kpasswdd \
+ ldconfig \
+ local \
+ localpkg \
+ lockd \
+ lpd \
+ mixer \
+ motd \
+ mountcritlocal \
+ mountcritremote \
+ mountlate \
+ mdconfig \
+ mdconfig2 \
+ mountd \
+ moused \
+ mroute6d \
+ mrouted \
+ msgs \
+ named \
+ natd \
+ netif \
+ netoptions \
+ netwait \
+ newsyslog \
+ nfsclient \
+ nfscbd \
+ nfsd \
+ nfsuserd \
+ nisdomain \
+ ${_nscd} \
+ nsswitch \
+ ntpd \
+ ntpdate \
+ ${_opensm} \
othermta \
- pf pflog pfsync \
- powerd power_profile ppp pppoed pwcheck \
+ pf \
+ pflog \
+ pfsync \
+ powerd \
+ power_profile \
+ ppp \
+ pppoed \
+ pwcheck \
quota \
- random rarpd rctl resolv rfcomm_pppd_server root \
- route6d routed routing rpcbind rtadvd rtsold rwho \
- savecore sdpd securelevel sendmail \
- serial sppp statd static_arp static_ndp stf swap1 \
- syscons sysctl syslogd \
- timed tmp \
+ random \
+ rarpd \
+ rctl \
+ resolv \
+ rfcomm_pppd_server \
+ root \
+ route6d \
+ routed \
+ routing \
+ rpcbind \
+ rtadvd \
+ rtsold \
+ rwho \
+ savecore \
+ sdpd \
+ securelevel \
+ sendmail \
+ serial \
+ sppp \
+ ${_sshd} \
+ statd \
+ static_arp \
+ static_ndp \
+ stf \
+ swap1 \
+ syscons \
+ sysctl \
+ syslogd \
+ timed \
+ tmp \
+ ${_ubthidhci} \
ugidfw \
- var virecover \
- watchdogd wpa_supplicant \
- ypbind yppasswdd ypserv \
- ypset ypupdated ypxfrd \
- zfs zvol
+ var \
+ virecover \
+ watchdogd \
+ wpa_supplicant \
+ ypbind \
+ yppasswdd \
+ ypserv \
+ ypset \
+ ypupdated \
+ ypxfrd \
+ zfs \
+ zvol
.if ${MK_IPX} != "no"
-FILES+= ipxrouted
+_ipxrouted= ipxrouted
.endif
.if ${MK_OFED} != "no"
-FILES+= opensm
+_opensm= opensm
.endif
.if ${MK_OPENSSH} != "no"
-FILES+= sshd
+_sshd= sshd
.endif
.if ${MK_NS_CACHING} != "no"
-FILES+= nscd
+_nscd= nscd
.endif
.if ${MK_BLUETOOTH} != "no"
-FILES+= ubthidhci
+_ubthidhci= ubthidhci
.endif
FILESDIR= /etc/rc.d
_______________________________________________
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
