Author: brd Date: Sat Jul 28 20:36:23 2018 New Revision: 336845 URL: https://svnweb.freebsd.org/changeset/base/336845
Log: Move rc startup scripts from etc/ to sbin/init/ This keeps most startup scripts as CONFS per discussion on src-committers from back during BSDCan. Approved by: will (mentor) Differential Revision: https://reviews.freebsd.org/D16466 Added: head/sbin/init/rc.d/ - copied from r336844, head/etc/rc.d/ Deleted: head/etc/rc.d/ Modified: head/etc/Makefile head/etc/defaults/Makefile head/sbin/init/Makefile head/sbin/init/rc.d/Makefile Modified: head/etc/Makefile ============================================================================== --- head/etc/Makefile Sat Jul 28 20:33:08 2018 (r336844) +++ head/etc/Makefile Sat Jul 28 20:36:23 2018 (r336845) @@ -31,19 +31,14 @@ BIN1= crontab \ mac.conf \ motd \ netconfig \ - network.subr \ networks \ newsyslog.conf \ nsswitch.conf \ phones \ profile \ protocols \ - rc \ rc.bsdextended \ rc.firewall \ - rc.initdiskless \ - rc.shutdown \ - rc.subr \ remote \ rpc \ services \ @@ -144,9 +139,6 @@ BIN1+= csh.cshrc csh.login csh.logout BIN1+= regdomain.xml .endif -# -rwxr-xr-x root:wheel, for the new cron root:wheel -BIN2= netstart pccard_ether rc.suspend rc.resume - .if ${MK_SENDMAIL} == "no" ETCMAIL=mailer.conf aliases .else @@ -187,8 +179,6 @@ distribution: ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 644 \ ${BIN1} ${DESTDIR}/etc; \ cap_mkdb ${CAP_MKDB_ENDIAN} ${DESTDIR}/etc/login.conf; \ - ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 755 \ - ${BIN2} ${DESTDIR}/etc; \ ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 600 \ master.passwd nsmb.conf opieaccess ${DESTDIR}/etc; @@ -235,7 +225,6 @@ distribution: .if ${MK_PKGBOOTSTRAP} != "no" ${_+_}cd ${.CURDIR}/pkg; ${MAKE} install .endif - ${_+_}cd ${.CURDIR}/rc.d; ${MAKE} install ${_+_}cd ${SRCTOP}/share/termcap; ${MAKE} etc-termcap ${_+_}cd ${.CURDIR}/syslog.d; ${MAKE} install ${_+_}cd ${SRCTOP}/usr.sbin/rmt; ${MAKE} etc-rmt Modified: head/etc/defaults/Makefile ============================================================================== --- head/etc/defaults/Makefile Sat Jul 28 20:33:08 2018 (r336844) +++ head/etc/defaults/Makefile Sat Jul 28 20:36:23 2018 (r336845) @@ -2,7 +2,7 @@ .include <src.opts.mk> -FILES= devfs.rules periodic.conf rc.conf +FILES= devfs.rules periodic.conf FILESDIR= /etc/defaults .if ${MK_BLUETOOTH} != "no" Modified: head/sbin/init/Makefile ============================================================================== --- head/sbin/init/Makefile Sat Jul 28 20:33:08 2018 (r336844) +++ head/sbin/init/Makefile Sat Jul 28 20:36:23 2018 (r336845) @@ -1,6 +1,15 @@ # @(#)Makefile 8.1 (Berkeley) 7/19/93 # $FreeBSD$ +FILESGROUPS= FILESETC FILESETCEXEC FILESETCDEFAULTS +FILESETCDIR= /etc +FILESETC= network.subr rc rc.initdiskless rc.subr rc.shutdown +FILESETCMODE= 644 +FILESETCEXEC= netstart pccard_ether rc.resume rc.suspend +FILESETCEXECDIR= /etc +FILESETCEXECMODE= 755 +FILESETCDEFAULTSDIR= /etc/defaults +FILESETCDEFAULTS= rc.conf PACKAGE=runtime PROG= init SRCS= init.c getmntopts.c @@ -16,5 +25,7 @@ CFLAGS+=-I${MOUNT} .PATH: ${MOUNT} NO_SHARED?= YES + +SUBDIR+= rc.d .include <bsd.prog.mk> Modified: head/sbin/init/rc.d/Makefile ============================================================================== --- head/etc/rc.d/Makefile Sat Jul 28 20:33:08 2018 (r336844) +++ head/sbin/init/rc.d/Makefile Sat Jul 28 20:36:23 2018 (r336845) @@ -2,10 +2,10 @@ .include <src.opts.mk> -BINDIR= /etc/rc.d -FILESGROUPS= FILES +CONFSDIR= /etc/rc.d +CONFSGROUPS= CONFS -FILES= DAEMON \ +CONFS= DAEMON \ FILESYSTEMS \ LOGIN \ NETWORKING \ @@ -75,7 +75,6 @@ FILES= DAEMON \ netif \ netoptions \ netwait \ - newsyslog \ nfsclient \ nfscbd \ nfsd \ @@ -113,8 +112,6 @@ FILES= DAEMON \ stf \ swap \ swaplate \ - sysctl \ - syslogd \ tmp \ ${_ubthidhci} \ ugidfw \ @@ -123,7 +120,7 @@ FILES= DAEMON \ watchdogd .if ${MK_NIS} != "no" -FILES+= ypbind \ +CONFS+= ypbind \ ypldap \ yppasswdd \ ypserv \ @@ -133,29 +130,29 @@ FILES+= ypbind \ .endif .if ${MK_ACCT} != "no" -FILESGROUPS+= ACCT +CONFSGROUPS+= ACCT ACCT+= accounting ACCTPACKAGE= acct .endif .if ${MK_ACPI} != "no" -FILESGROUPS+= ACPI +CONFSGROUPS+= ACPI ACPI= power_profile ACPIPACKAGE= acpi .endif .if ${MK_ACPI} != "no" || ${MK_APM} != "no" -FILES+= powerd +CONFS+= powerd .endif .if ${MK_AMD} != "no" -FILESGROUPS+= AMD +CONFSGROUPS+= AMD AMD+= amd AMDPACKAGE= amd .endif .if ${MK_APM} != "no" -FILESGROUPS+= APM +CONFSGROUPS+= APM APM+= apm .if ${MACHINE} == "i386" APM+= apmd @@ -164,9 +161,9 @@ APMPACKAGE= apm .endif .if ${MK_AUTOFS} != "no" -FILES+= automount -FILES+= automountd -FILES+= autounmountd +CONFS+= automount +CONFS+= automountd +CONFS+= autounmountd .endif .if ${MK_BLACKLIST} != "no" @@ -177,77 +174,81 @@ _blacklistd+= blacklistd _bluetooth= bluetooth _bthidd= bthidd _hcsecd= hcsecd -FILES+= rfcomm_pppd_server -FILES+= sdpd +CONFS+= rfcomm_pppd_server +CONFS+= sdpd _ubthidhci= ubthidhci .endif .if ${MK_BOOTPARAMD} != "no" -FILES+= bootparams +CONFS+= bootparams .endif .if ${MK_BSNMP} != "no" -FILESGROUPS+= BSNMP +CONFSGROUPS+= BSNMP BSNMP+= bsnmpd BSNMPPACKAGE= bsnmp .endif .if ${MK_CCD} != "no" -FILES+= ccd +CONFS+= ccd .endif .if ${MK_FTP} != "no" -FILES+= ftpd +CONFS+= ftpd .endif .if ${MK_HAST} != "no" -FILESGROUPS+= HAST +CONFSGROUPS+= HAST HAST= hastd HASTPACKAGE= hast .endif .if ${MK_INETD} != "no" -FILES+= inetd +CONFS+= inetd .endif .if ${MK_IPFW} != "no" -FILES+= ipfw +CONFS+= ipfw .if ${MK_NETGRAPH} != "no" -FILES+= ipfw_netflow +CONFS+= ipfw_netflow .endif .endif .if ${MK_ISCSI} != "no" -FILES+= iscsictl -FILES+= iscsid +CONFS+= iscsictl +CONFS+= iscsid .endif .if ${MK_JAIL} != "no" -FILESGROUPS+= JAIL +CONFSGROUPS+= JAIL JAIL+= jail JAILPACKAGE= jail .endif .if ${MK_LEGACY_CONSOLE} != "no" -FILES+= moused -FILES+= syscons +CONFS+= moused +CONFS+= syscons .endif .if ${MK_LPR} != "no" -FILES+= lpd +CONFS+= lpd .endif .if ${MK_KERBEROS} != "no" -FILES+= ipropd_master -FILES+= ipropd_slave +CONFS+= ipropd_master +CONFS+= ipropd_slave _kadmind= kadmind _kdc= kdc _kfd= kfd _kpasswdd= kpasswdd + +DIRS+= VAR_HEMIDAL +VAR_HEMIDAL= /var/heimdal +VAR_HEMIDAL_MODE= 700 .endif .if ${MK_MAIL} != "no" -FILES+= othermta +CONFS+= othermta .endif .if ${MK_NS_CACHING} != "no" @@ -255,7 +256,7 @@ _nscd= nscd .endif .if ${MK_NTP} != "no" -FILES+= ntpd +CONFS+= ntpd .endif .if ${MK_OFED} != "no" @@ -263,35 +264,35 @@ _opensm= opensm .endif .if ${MK_OPENSSL} != "no" -FILES+= keyserv +CONFS+= keyserv .endif .if ${MK_OPENSSH} != "no" -FILESGROUPS+= SSH +CONFSGROUPS+= SSH SSH= sshd SSHPACKAGE= ssh .endif .if ${MK_PF} != "no" -FILES+= ftp-proxy +CONFS+= ftp-proxy .endif .if ${MK_ROUTED} != "no" -FILES+= routed +CONFS+= routed .endif .if ${MK_SENDMAIL} != "no" -FILESGROUPS+= SMRCD +CONFSGROUPS+= SMRCD SMRCD= sendmail SMRCDPACKAGE= sendmail .endif .if ${MK_TIMED} != "no" -FILES+= timed +CONFS+= timed .endif .if ${MK_UNBOUND} != "no" -FILESGROUPS+= UNBOUND +CONFSGROUPS+= UNBOUND UNBOUND+= local_unbound UNBOUNDPACKAGE= unbound .endif @@ -301,26 +302,29 @@ _utx= utx .endif .if ${MK_VI} != "no" -FILESGROUPS+= VI +CONFSGROUPS+= VI VI+= virecover VIPACKAGE= vi .endif .if ${MK_WIRELESS} != "no" -FILES+= hostapd -FILES+= wpa_supplicant +CONFS+= hostapd +CONFS+= wpa_supplicant .endif .if ${MK_ZFS} != "no" -FILESGROUPS+= ZFS +CONFSGROUPS+= ZFS ZFS+= zfs ZFS+= zfsbe ZFS+= zfsd ZFS+= zvol ZFSPACKAGE= zfs +DIRS+= ETC_ZFS +ETC_ZFS= /etc/zfs +ETC_ZFSPACKAGE= zfs .endif -.for fg in ${FILESGROUPS} +.for fg in ${CONFSGROUPS} ${fg}MODE?= ${BINMODE} .endfor _______________________________________________ svn-src-head@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
