Date: Tue, 23 Aug 2011 14:20:59 -0700 From: Xin LI <delphij@delphij.net> To: Doug Barton <dougb@FreeBSD.org> Cc: freebsd-rc@FreeBSD.org, delphij@FreeBSD.org Subject: Re: conf/145344: [patch] Fix kitchen sink approach for rc.d scripts installation Message-ID: <4E5419BB.4090901@delphij.net> In-Reply-To: <4E5408DD.1040508@FreeBSD.org> References: <201108231939.p7NJdUoj082042@freefall.freebsd.org> <4E5408DD.1040508@FreeBSD.org>
next in thread | previous in thread | raw e-mail | index | archive | help
This is a multi-part message in MIME format. --------------060906080502010104080009 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA256 On 08/23/11 13:09, Doug Barton wrote: > On 08/23/2011 12:39, delphij@FreeBSD.org wrote: >> Synopsis: [patch] Fix kitchen sink approach for rc.d scripts >> installation >> >> Responsible-Changed-From-To: freebsd-rc->delphij >> Responsible-Changed-By: delphij Responsible-Changed-When: Tue Aug >> 23 19:39:21 UTC 2011 Responsible-Changed-Why: Take. > > Thanks for taking this on, just one request ... please ask here > for pre-commit review before moving forward. :) I think this is a > good project, it just makes me nervous. Sure. I've actually redone the patch and here is a WIP snapshot (it's WIP and is not final, just what the patch would look like). Question: A few scripts that are optional but were hardcoded in other rc.d scripts. How should we handle with these cases? Do we want to 'edit' other scripts so they don't put REQUIRE with them? Cheers, - -- Xin LI <delphij@delphij.net> https://www.delphij.net/ FreeBSD - The Power to Serve! Live free or die -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.18 (FreeBSD) iQEcBAEBCAAGBQJOVBm7AAoJEATO+BI/yjfBooAIANFqb/ExLjobxCgqhMweAO13 1NQR2wa2vjZVMvrVU8p2xwVcHFdgvxXtU1A5tMwJp5lo6uIbanJZlpninzj97GIU 4Ynhm0dW2D+nJZ/PwnXTbJkG6OTbNSihU+tsTZelEnUWu1EsnvhXAZCOSOR8XJcd 79hkjM9IGDTvZxoJFWqaysSIvJfh6ULx581HSHVLQnMwcCjy/W7f86p9Bq2MxDU+ BmD7uojdRZg5C70Qf8QHzex6Aw9UuN50AShUDurBuqsI4JgkEYtGIHDDkZ0mPCRA zYzgkgcKzol74RY9S+FGR1UcZsOznt/1q495w8TQlQjEoLuJFWams66A0nNxIu8= =0Bxo -----END PGP SIGNATURE----- --------------060906080502010104080009 Content-Type: text/plain; name="rc-optional.diff" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="rc-optional.diff" Index: etc/rc.d/Makefile =================================================================== --- etc/rc.d/Makefile (revision 225120) +++ etc/rc.d/Makefile (working copy) @@ -2,50 +2,194 @@ .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 \ - 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 \ - 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 \ - othermta \ - 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 stf swap1 \ - syscons sysctl syslogd \ - timed tmp \ - ugidfw \ - var virecover \ - watchdogd wpa_supplicant \ - ypbind yppasswdd ypserv \ - ypset ypupdated ypxfrd \ - zfs zvol +FILES= DAEMON FILESYSTEMS LOGIN NETWORKING SERVERS +FILES+= abi +FILES+= addswap +FILES+= adjkerntz +FILES+= archdep +FILES+= bgfsck +FILES+= bootparams +FILES+= bridge +FILES+= ccd +FILES+= cleanvar +FILES+= cleartmp +FILES+= cron +FILES+= ddb +FILES+= defaultroute +FILES+= devd +FILES+= devfs +FILES+= dhclient +FILES+= dmesg +FILES+= dumpon +FILES+= encswap +FILES+= faith +FILES+= fsck +FILES+= ftpd +FILES+= gbde +FILES+= geli +FILES+= geli2 +FILES+= gptboot +FILES+= gssd +FILES+= hastd +FILES+= hostid +FILES+= hostid_save +FILES+= hostname +FILES+= inetd +FILES+= initrandom +FILES+= ipsec +FILES+= kld +FILES+= kldxref +FILES+= ldconfig +FILES+= local +FILES+= localpkg +FILES+= lockd +FILES+= lpd +FILES+= mdconfig +FILES+= mdconfig2 +FILES+= mixer +FILES+= motd +FILES+= mountcritlocal +FILES+= mountcritremote +FILES+= mountd +FILES+= mountlate +FILES+= moused +FILES+= msgs +FILES+= netif +FILES+= netoptions +FILES+= netwait +FILES+= newsyslog +FILES+= nfscbd +FILES+= nfsclient +FILES+= nfsd +FILES+= nfsuserd +FILES+= nsswitch +FILES+= othermta +FILES+= power_profile +FILES+= powerd +FILES+= ppp +FILES+= pwcheck +FILES+= quota +FILES+= random +FILES+= rarpd +FILES+= rctl +FILES+= resolv +FILES+= root +FILES+= routing +FILES+= rpcbind +FILES+= savecore +FILES+= securelevel +FILES+= serial +FILES+= statd +FILES+= static_arp +FILES+= stf +FILES+= swap1 +FILES+= syscons +FILES+= sysctl +FILES+= syslogd +FILES+= timed +FILES+= tmp +FILES+= ugidfw +FILES+= var +FILES+= virecover +FILES+= watchdogd + +.if ${MK_ACCT} != "no" +FILES+= accounting +.endif + +.if ${MK_AMD} != "no" +FILES+= amd +.endif + +.if ${MK_APM} != "no" +FILES+= apm +FILES+= apmd +.endif + +.if ${MK_ATM} != "no" +FILES+= atm1 +FILES+= atm2 +FILES+= atm3 +.endif + +.if ${MK_AUDIT} != "no" +FILES+= auditd +.endif + +.if ${MK_BLUETOOTH} != "no" +FILES+= bluetooth +FILES+= bthidd +FILES+= hcsecd +FILES+= rfcomm_pppd_server +FILES+= sdpd +FILES+= ubthidhci +.endif + +.if ${MK_BSNMP} != "no" +FILES+= bsnmpd +.endif + +.if ${MK_INET6} != "no" +FILES+= mroute6d +FILES+= route6d +FILES+= rtadvd +FILES+= rtsold +.endif + +.if ${MK_INET6_SUPPORT} != "no" +FILES+= ip6addrctl +.endif + +.if ${MK_IPFILTER} != "no" +FILES+= ipfilter +FILES+= ipfs +FILES+= ipmon +FILES+= ipnat +.endif + +.if ${MK_IPFW} != "no" +FILES+= ipfw +FILES+= natd +.endif + .if ${MK_IPX} != "no" FILES+= ipxrouted .endif +.if ${MK_JAIL} != "no" +FILES+= jail +.endif + +.if ${MK_KERBEROS} != "no" +FILES+= kadmind +FILES+= kerberos +FILES+= kpasswdd +.endif + +.if ${MK_BIND_NAMED} != "no" +FILES+= named +.endif + +.if ${MK_NIS} != "no" +FILES+= nisdomain +FILES+= ypbind +FILES+= yppasswdd +FILES+= ypserv +FILES+= ypset +FILES+= ypupdated +FILES+= ypxfrd +.endif + +.if ${MK_NS_CACHING} != "no" +FILES+= nscd +.endif + +.if ${MK_NTP} != "no" +FILES+= ntpd +FILES+= ntpdate +.endif + .if ${MK_OFED} != "no" FILES+= opensm .endif @@ -54,14 +198,45 @@ FILES+= opensm FILES+= sshd .endif -.if ${MK_NS_CACHING} != "no" -FILES+= nscd +.if ${MK_OPENSSL} != "no" +FILES+= keyserv .endif -.if ${MK_BLUETOOTH} != "no" -FILES+= ubthidhci +.if ${MK_PF} != "no" +FILES+= ftp-proxy +FILES+= pf +FILES+= pflog +FILES+= pfsync .endif +.if ${MK_PPP} != "no" +FILES+= pppoed +FILES+= sppp +.endif + +.if ${MK_RCMDS} != "no" +FILES+= rwho +.endif + +.if ${MK_ROUTED} != "no" +FILES+= mrouted +FILES+= routed +.endif + +.if ${MK_SENDMAIL} != "no" +FILES+= sendmail +.endif + +.if ${MK_WIRELESS} != "no" +FILES+= hostapd +FILES+= wpa_supplicant +.endif + +.if ${MK_ZFS} != "no" +FILES+= zfs +FILES+= zvol +.endif + FILESDIR= /etc/rc.d FILESMODE= ${BINMODE} --------------060906080502010104080009--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?4E5419BB.4090901>