DELETED DAEMON.init Index: DAEMON.init ================================================================== --- DAEMON.init +++ /dev/null @@ -1,3 +0,0 @@ -# vim:ft=make: - -DAEMON: pwcheck sysctl sysdb NETWORK SERVERS ldconfig nfsclient ADDED DAEMON.init.mk Index: DAEMON.init.mk ================================================================== --- /dev/null +++ DAEMON.init.mk @@ -0,0 +1,1 @@ +DAEMON: pwcheck sysctl sysdb NETWORK SERVERS ldconfig nfsclient DELETED LOGIN.init Index: LOGIN.init ================================================================== --- LOGIN.init +++ /dev/null @@ -1,3 +0,0 @@ -# vim:ft=make: - -LOGIN: DAEMON dntpd ADDED LOGIN.init.mk Index: LOGIN.init.mk ================================================================== --- /dev/null +++ LOGIN.init.mk @@ -0,0 +1,1 @@ +LOGIN: DAEMON dntpd Index: Makefile ================================================================== --- Makefile +++ Makefile @@ -11,22 +11,22 @@ .if !target(_service) || !target(_earlyservice) .error No service handler defined. .endif #.MAKE.JOBS?=2 -#.SILENT: +.SILENT: .if defined(AUTOBOOT) -SCRIPTS=${:!find /etc/mrc -name '*.init' -o -name '*.service'!:S/\/etc\/mrc\///} +SCRIPTS=${:!find /etc/mrc -name '*.init.mk' -o -name '*.service.mk'!:S/\/etc\/mrc\///} .ERROR: : ERROR: ABORTING BOOT (sending SIGTERM to parent)! : target ${.ERROR_TARGET} failed to execute: : ${.ERROR_CMD} kill 1 .else -SCRIPTS=${:!find /etc/mrc -name '*.service'!:S/\/etc\/mrc\///} +SCRIPTS=${:!find /etc/mrc -name '*.service.mk'!:S/\/etc\/mrc\///} DAEMON: NETWORK SERVERS LOGIN: DAEMON @@ -38,11 +38,11 @@ .endif test: echo Empty target. -TARGETS:=${SCRIPTS:S/.init//:S/.service//} +TARGETS:=${SCRIPTS:S/.init.mk//:S/.service.mk//} .MAIN: ${TARGETS} .PHONY: ${TARGETS} ${OTHER_TARGETS} DELETED NETWORK.init Index: NETWORK.init ================================================================== --- NETWORK.init +++ /dev/null @@ -1,3 +0,0 @@ -# vim:ft=make: - -NETWORK: ifconfig devd hostname ADDED NETWORK.init.mk Index: NETWORK.init.mk ================================================================== --- /dev/null +++ NETWORK.init.mk @@ -0,0 +1,1 @@ +NETWORK: ifconfig devd hostname DELETED SERVERS.init Index: SERVERS.init ================================================================== --- SERVERS.init +++ /dev/null @@ -1,3 +0,0 @@ -# vim:ft=make: - -SERVERS: swap mountlate syslogd ADDED SERVERS.init.mk Index: SERVERS.init.mk ================================================================== --- /dev/null +++ SERVERS.init.mk @@ -0,0 +1,1 @@ +SERVERS: swap mountlate syslogd DELETED SERVICE.init Index: SERVICE.init ================================================================== --- SERVICE.init +++ /dev/null @@ -1,1 +0,0 @@ -SERVICE: ifconfig mount random hostname cleanvar ADDED SERVICE.init.mk Index: SERVICE.init.mk ================================================================== --- /dev/null +++ SERVICE.init.mk @@ -0,0 +1,1 @@ +SERVICE: ifconfig mount random hostname cleanvar DELETED adjkerntz.init Index: adjkerntz.init ================================================================== --- adjkerntz.init +++ /dev/null @@ -1,5 +0,0 @@ -# vim:ft=make: - -adjkerntz: random mount - : Adjust kernel timezone. - adjkerntz -i ADDED adjkerntz.init.mk Index: adjkerntz.init.mk ================================================================== --- /dev/null +++ adjkerntz.init.mk @@ -0,0 +1,3 @@ +adjkerntz: random mount + echo "MRC:$@> Adjust kernel timezone." + adjkerntz -i DELETED automountd.service Index: automountd.service ================================================================== --- automountd.service +++ /dev/null @@ -1,8 +0,0 @@ -# vim:ft=make: - -DAEMON_automountd_COMMAND?=/usr/sbin/automountd -DAEMON_automountd_ENABLE?=no -DAEMON_automountd_MODULES=autofs - -automountd: _service # nfsclient -> DAEMON - test -z "$${DAEMON_$@_ENABLE}" || /usr/sbin/automount ADDED automountd.service.mk Index: automountd.service.mk ================================================================== --- /dev/null +++ automountd.service.mk @@ -0,0 +1,6 @@ +DAEMON_automountd_COMMAND?=/usr/sbin/automountd +DAEMON_automountd_ENABLE?=no +DAEMON_automountd_MODULES=autofs + +automountd: _service # nfsclient -> DAEMON + test -z "$${DAEMON_$@_ENABLE}" || /usr/sbin/automount DELETED bootfs.init Index: bootfs.init ================================================================== --- bootfs.init +++ /dev/null @@ -1,5 +0,0 @@ -# vim:ft=make: - -bootfs: fsck - : Checking whether we need /boot mounted. - mount -vadr | grep -q ' /boot$$' && mount -r /boot || true ADDED bootfs.init.mk Index: bootfs.init.mk ================================================================== --- /dev/null +++ bootfs.init.mk @@ -0,0 +1,3 @@ +bootfs: fsck + echo "MRC:$@> Checking whether we need /boot mounted." + mount -vadr | grep -q ' /boot$$' && mount -r /boot || true DELETED cleanvar.init Index: cleanvar.init ================================================================== --- cleanvar.init +++ /dev/null @@ -1,9 +0,0 @@ -# vim:ft=make: - -CLEANVAR_DIRS?=/var/run /var/spool/lock /var/spool/uucp/.Temp - -cleanvar: mount -.for dir in ${CLEANVAR_DIRS} - -test -d ${dir} && find ${dir} -mindepth 1 -delete -.endfor - install -m644 /dev/null /var/run/utmpx ADDED cleanvar.init.mk Index: cleanvar.init.mk ================================================================== --- /dev/null +++ cleanvar.init.mk @@ -0,0 +1,8 @@ +CLEANVAR_DIRS?=/var/run /var/spool/lock /var/spool/uucp/.Temp + +cleanvar: mount + echo "MRC:$@> Cleaning 'var's." +.for dir in ${CLEANVAR_DIRS} + -test -d ${dir} && find ${dir} -mindepth 1 -delete +.endfor + install -m644 /dev/null /var/run/utmpx DELETED cloned.init Index: cloned.init ================================================================== --- cloned.init +++ /dev/null @@ -1,6 +0,0 @@ -# vim:ft=make: - -cloned: kld -.for iface in ${CLONED_INTERFACES} - ifconfig ${iface} create -.endfor ADDED cloned.init.mk Index: cloned.init.mk ================================================================== --- /dev/null +++ cloned.init.mk @@ -0,0 +1,5 @@ +cloned: kld + echo "MRC:$@> Cloning interfaces: ${CLONED_INTERFACES}" +.for iface in ${CLONED_INTERFACES} + ifconfig ${iface} create +.endfor DELETED cron.service Index: cron.service ================================================================== --- cron.service +++ /dev/null @@ -1,6 +0,0 @@ -# vim:ft=make: - -DAEMON_cron_COMMAND?=/usr/sbin/cron -DAEMON_cron_FLAGS?=-s - -cron: _service LOGIN ADDED cron.service.mk Index: cron.service.mk ================================================================== --- /dev/null +++ cron.service.mk @@ -0,0 +1,4 @@ +DAEMON_cron_COMMAND?=/usr/sbin/cron +DAEMON_cron_FLAGS?=-s + +cron: _service LOGIN Index: daemon.starter.mk ================================================================== --- daemon.starter.mk +++ daemon.starter.mk @@ -5,10 +5,11 @@ .endif .for target in ${LOCAL_TARGETS} ${target}: ${target:C/_service.*/DAEMON/:C/_earlyservice.*/SERVICE/} .USE test -z "$${DAEMON_$@_ENABLE}" || { \ + echo "MRC:$@> Starting service."; \ test -n "${DAEMON_$@_MODULES}" && kldload -n ${DAEMON_$@_MODULES} || true; \ daemon -c -u ${DAEMON_$@_USER:Uroot} -r -P /var/run/daemon.$@.pid ${DAEMON_$@_COMMAND} ${DAEMON_$@_FLAGS}; \ } .endfor DELETED dbus.service Index: dbus.service ================================================================== --- dbus.service +++ /dev/null @@ -1,12 +0,0 @@ -# vim:ft=make: - -DAEMON_dbus_COMMAND?=/usr/local/bin/dbus-daemon -DAEMON_dbus_ENABLE?=no -DAEMON_dbus_FLAGS?=--system - -dbus: _service -.export DAEMON_$@_ENABLE - test -z "$${DAEMON_$@_ENABLE}" || { \ - /usr/local/bin/dbus-uuidgen --ensure; \ - mkdir -p /var/run/dbus; \ - } ADDED dbus.service.mk Index: dbus.service.mk ================================================================== --- /dev/null +++ dbus.service.mk @@ -0,0 +1,9 @@ +DAEMON_dbus_COMMAND?=/usr/local/bin/dbus-daemon +DAEMON_dbus_ENABLE?=no +DAEMON_dbus_FLAGS?=--system + +dbus: _service + test -z "$${DAEMON_$@_ENABLE}" || { \ + /usr/local/bin/dbus-uuidgen --ensure; \ + mkdir -p /var/run/dbus; \ + } DELETED devd.service Index: devd.service ================================================================== --- devd.service +++ /dev/null @@ -1,8 +0,0 @@ -# vim:ft=make: - -DAEMON_devd_COMMAND?=/sbin/devd -DAEMON_devd_ENABLE?=yes -DAEMON_devd_FLAGS?=-dq - -devd: _earlyservice - test -n "$${DAEMON_$@_ENABLE}" || sysctl hw.bus.devctl_disable=1 ADDED devd.service.mk Index: devd.service.mk ================================================================== --- /dev/null +++ devd.service.mk @@ -0,0 +1,6 @@ +DAEMON_devd_COMMAND?=/sbin/devd +DAEMON_devd_ENABLE?=yes +DAEMON_devd_FLAGS?=-dq + +devd: _earlyservice + test -n "$${DAEMON_$@_ENABLE}" || sysctl hw.bus.devctl_disable=1 DELETED devfs.init Index: devfs.init ================================================================== --- devfs.init +++ /dev/null @@ -1,11 +0,0 @@ -# vim:ft=make: - -DEVFS_CONFIG_FILES?=/etc/defaults/devfs.conf /etc/devfs.conf - -devfs: - : Applying devfs rules. -.for file in ${DEVFS_CONFIG_FILES} -.if exists(${file}) - devfsctl -a -f ${file} -.endif -.endfor ADDED devfs.init.mk Index: devfs.init.mk ================================================================== --- /dev/null +++ devfs.init.mk @@ -0,0 +1,9 @@ +DEVFS_CONFIG_FILES?=/etc/defaults/devfs.conf /etc/devfs.conf + +devfs: + echo "MRC:$@> Applying rules: ${DEVFS_CONFIG_FILES}" +.for file in ${DEVFS_CONFIG_FILES} +.if exists(${file}) + devfsctl -a -f ${file} +.endif +.endfor DELETED dhcpcd.service Index: dhcpcd.service ================================================================== --- dhcpcd.service +++ /dev/null @@ -1,7 +0,0 @@ -# vim:ft=make: - -DAEMON_dhcpcd_COMMAND?=/sbin/dhcpcd -DAEMON_dhcpcd_ENABLE?=no -DAEMON_dhcpcd_FLAGS?=-B - -dhcpcd: _service NETWORK SERVICE # mount -> SERVICE, cleanvar -> SERVICE ADDED dhcpcd.service.mk Index: dhcpcd.service.mk ================================================================== --- /dev/null +++ dhcpcd.service.mk @@ -0,0 +1,5 @@ +DAEMON_dhcpcd_COMMAND?=/sbin/dhcpcd +DAEMON_dhcpcd_ENABLE?=no +DAEMON_dhcpcd_FLAGS?=-B + +dhcpcd: _service NETWORK SERVICE # mount -> SERVICE, cleanvar -> SERVICE DELETED dmesg.init Index: dmesg.init ================================================================== --- dmesg.init +++ /dev/null @@ -1,7 +0,0 @@ -# vim:ft=make: - -DMESG_FILE?=/var/run/dmesg.boot - -dmesg: mountlate - : Writing dmesg. - umask 022 ; dmesg -a >> ${DMESG_FILE} ADDED dmesg.init.mk Index: dmesg.init.mk ================================================================== --- /dev/null +++ dmesg.init.mk @@ -0,0 +1,5 @@ +DMESG_FILE?=/var/run/dmesg.boot + +dmesg: mountlate + echo "MRC:$@> Writing dmesg." + umask 022 ; dmesg -a >> ${DMESG_FILE} DELETED dntpd.service Index: dntpd.service ================================================================== --- dntpd.service +++ /dev/null @@ -1,6 +0,0 @@ -# vim:ft=make: - -DAEMON_dntpd_COMMAND?=/usr/sbin/dntpd -DAEMON_dntpd_FLAGS?=-F - -dntpd: _service NETWORK ADDED dntpd.service.mk Index: dntpd.service.mk ================================================================== --- /dev/null +++ dntpd.service.mk @@ -0,0 +1,4 @@ +DAEMON_dntpd_COMMAND?=/usr/sbin/dntpd +DAEMON_dntpd_FLAGS?=-F + +dntpd: _service NETWORK DELETED dumpon.init Index: dumpon.init ================================================================== --- dumpon.init +++ /dev/null @@ -1,7 +0,0 @@ -# vim:ft=make: - -DUMPDEV?=no - -dumpon: random - : Setting dumpon device. - test -e ${DUMPDEV} && dumpon -v ${DUMPDEV} || true ADDED dumpon.init.mk Index: dumpon.init.mk ================================================================== --- /dev/null +++ dumpon.init.mk @@ -0,0 +1,7 @@ +DUMPDEV?=no + +dumpon: random + test -e ${DUMPDEV} && { \ + echo "MRC:$@> Setting dumpon device to ${DUMPDEV}"; \ + dumpon -v ${DUMPDEV}; \ + } || true DELETED fsck.init Index: fsck.init ================================================================== --- fsck.init +++ /dev/null @@ -1,5 +0,0 @@ -# vim:ft=make: - -fsck: - : Checking disks - fsck -p ADDED fsck.init.mk Index: fsck.init.mk ================================================================== --- /dev/null +++ fsck.init.mk @@ -0,0 +1,3 @@ +fsck: + echo "MRC:$@> Checking disks." + fsck -p DELETED hostname.init Index: hostname.init ================================================================== --- hostname.init +++ /dev/null @@ -1,7 +0,0 @@ -# vim:ft=make: - -HOSTNAME?=Amnesiac - -hostname: - : Setting hostname. - hostname ${HOSTNAME} ADDED hostname.init.mk Index: hostname.init.mk ================================================================== --- /dev/null +++ hostname.init.mk @@ -0,0 +1,5 @@ +HOSTNAME?=Amnesiac + +hostname: + echo "MRC:$@> Setting to ${HOSTNAME}." + hostname ${HOSTNAME} DELETED ifconfig.init Index: ifconfig.init ================================================================== --- ifconfig.init +++ /dev/null @@ -1,10 +0,0 @@ -# vim:ft=make: - -IFCONFIG_IFACES?=lo0 -IFCONFIG_lo0?=inet 127.0.0.1/8 up - -ifconfig: adjkerntz wlans cloned kld - : Starting interfaces. -.for iface in ${IFCONFIG_IFACES} - ifconfig ${iface} ${IFCONFIG_${iface}} -.endfor ADDED ifconfig.init.mk Index: ifconfig.init.mk ================================================================== --- /dev/null +++ ifconfig.init.mk @@ -0,0 +1,8 @@ +IFCONFIG_IFACES?=lo0 +IFCONFIG_lo0?=inet 127.0.0.1/8 up + +ifconfig: adjkerntz wlans cloned kld + echo "MRC:$@> Starting interfaces: ${IFCONFIG_IFACES}" +.for iface in ${IFCONFIG_IFACES} + ifconfig ${iface} ${IFCONFIG_${iface}} +.endfor DELETED inetd.service Index: inetd.service ================================================================== --- inetd.service +++ /dev/null @@ -1,7 +0,0 @@ -# vim:ft=make: - -DAEMON_inetd_COMMAND?=/usr/sbin/inetd -DAEMON_inetd_enable?=no -DAEMON_inetd_FLAGS?=-C 60 - -inetd: _service LOGIN ADDED inetd.service.mk Index: inetd.service.mk ================================================================== --- /dev/null +++ inetd.service.mk @@ -0,0 +1,5 @@ +DAEMON_inetd_COMMAND?=/usr/sbin/inetd +DAEMON_inetd_enable?=no +DAEMON_inetd_FLAGS?=-C 60 + +inetd: _service LOGIN DELETED kld.init Index: kld.init ================================================================== --- kld.init +++ /dev/null @@ -1,6 +0,0 @@ -# vim:ft=make: - -kld: bootfs -.if defined(KLD_LIST) - kldload -n ${KLD_LIST} -.endif ADDED kld.init.mk Index: kld.init.mk ================================================================== --- /dev/null +++ kld.init.mk @@ -0,0 +1,5 @@ +kld: bootfs +.if defined(KLD_LIST) + echo "MRC:$@> Loading kernel modules: ${KLD_LIST}" + kldload -n ${KLD_LIST} +.endif DELETED ldconfig.init Index: ldconfig.init ================================================================== --- ldconfig.init +++ /dev/null @@ -1,20 +0,0 @@ -# vim:ft=make: - -LDCONFIG_PATHS?=/lib /usr/lib /usr/local/lib /usr/pkg/lib -LDCONFIG_LOCAL_DIRS?=/usr/local/libdata/ldconfig - -.for ldc in ${LDCONFIG_PATHS} /etc/ld-elf.so.conf -.if exists(${ldc}) -ldc+=${ldc} -.endif -.endfor - -.for dir in ${LDCONFIG_LOCAL_DIRS} -.if exists(${dir}) -ldc+=${:!find ${dir} -type f!} -.endif -.endfor - -ldconfig: mountlate - : Initializing ldconfig. - ldconfig -elf ${ldc} ADDED ldconfig.init.mk Index: ldconfig.init.mk ================================================================== --- /dev/null +++ ldconfig.init.mk @@ -0,0 +1,18 @@ +LDCONFIG_PATHS?=/lib /usr/lib /usr/local/lib /usr/pkg/lib +LDCONFIG_LOCAL_DIRS?=/usr/local/libdata/ldconfig + +.for path in ${LDCONFIG_PATHS} /etc/ld-elf.so.conf +.if exists(${path}) +ldc+=${path} +.endif +.endfor + +.for dir in ${LDCONFIG_LOCAL_DIRS} +.if exists(${dir}) +ldc+=${:!find ${dir} -type f!} +.endif +.endfor + +ldconfig: mountlate + echo "MRC:$@> Initializing shared libraries: ${ldc}"; \ + ldconfig -elf ${ldc} DELETED mixer.init Index: mixer.init ================================================================== --- mixer.init +++ /dev/null @@ -1,9 +0,0 @@ -# vim:ft=make: - -mixers=${:!find /dev -name 'mixer*'!:S/\/dev\///} - -mixer: mount cleanvar - : Restoring mixer levels. -.for mixer in ${mixers} - -test -f /var/db/${mixer}-state && mixer -f /dev/${mixer} `cat /var/db/${mixer}-state` -.endfor ADDED mixer.init.mk Index: mixer.init.mk ================================================================== --- /dev/null +++ mixer.init.mk @@ -0,0 +1,7 @@ +mixers=${:!find /dev -name 'mixer*'!:S/\/dev\///} + +mixer: mount cleanvar + echo "MRC:$@> Restoring levels." +.for mixer in ${mixers} + -test -f /var/db/${mixer}-state && mixer -f /dev/${mixer} `cat /var/db/${mixer}-state` +.endfor DELETED mount.init Index: mount.init ================================================================== --- mount.init +++ /dev/null @@ -1,9 +0,0 @@ -# vim:ft=make: - -NETFS_TYPES?=nfs:NFS smbfs:SMB - -excludes=${NETFS_TYPES:C/:.*//} - -mount: root - : Mount local FS. - mount -a -t no${excludes:ts,} ADDED mount.init.mk Index: mount.init.mk ================================================================== --- /dev/null +++ mount.init.mk @@ -0,0 +1,7 @@ +NETFS_TYPES?=nfs:NFS smbfs:SMB + +excludes=${NETFS_TYPES:C/:.*//} + +mount: root + echo "MRC:$@> Mount local FS." + mount -a -t no${excludes:ts,} DELETED mountd.service Index: mountd.service ================================================================== --- mountd.service +++ /dev/null @@ -1,16 +0,0 @@ -# vim:ft=make: - -DAEMON_mountd_COMMAND?=/sbin/mountd -DAEMON_mountd_ENABLE?=no -DAEMON_mountd_FLAGS?=-r - -.if empty(DAEMON_mountd_ENABLE:tl:Mno) -DAEMON_rpcbind_ENABLE=yes -.endif - -mountd: rpcbind NETWORK SERVERS _service # mountlate -> SERVERS -.export DAEMON_$@_ENABLE - test -z "$${DAEMON_$@_ENABLE}" || { \ - rm -f /var/db/mountdtab; \ - ( umask 022 ; touch /var/db/mountdtab ); \ - } ADDED mountd.service.mk Index: mountd.service.mk ================================================================== --- /dev/null +++ mountd.service.mk @@ -0,0 +1,13 @@ +DAEMON_mountd_COMMAND?=/sbin/mountd +DAEMON_mountd_ENABLE?=no +DAEMON_mountd_FLAGS?=-r + +.if empty(DAEMON_mountd_ENABLE:tl:Mno) +DAEMON_rpcbind_ENABLE=yes +.endif + +mountd: rpcbind NETWORK SERVERS _service # mountlate -> SERVERS + test -z "$${DAEMON_$@_ENABLE}" || { \ + rm -f /var/db/mountdtab; \ + ( umask 022 ; touch /var/db/mountdtab ); \ + } DELETED mountlate.init Index: mountlate.init ================================================================== --- mountlate.init +++ /dev/null @@ -1,5 +0,0 @@ -# vim:ft=make: - -mountlate: NETWORK mount cleanvar runshm devd - : Mount late FS. - mount -a ADDED mountlate.init.mk Index: mountlate.init.mk ================================================================== --- /dev/null +++ mountlate.init.mk @@ -0,0 +1,3 @@ +mountlate: NETWORK mount cleanvar runshm devd + echo "MRC:$@> Mount late FS." + mount -a DELETED nextboot.init Index: nextboot.init ================================================================== --- nextboot.init +++ /dev/null @@ -1,7 +0,0 @@ -# vim:ft=make: - -nextboot: mount -.if exists(/boot/nextkernel) - : Removing nextboot setting. - rm -f /boot/nextkernel -.endif ADDED nextboot.init.mk Index: nextboot.init.mk ================================================================== --- /dev/null +++ nextboot.init.mk @@ -0,0 +1,5 @@ +nextboot: mount +.if exists(/boot/nextkernel) + echo "MRC:$@> Removing nextboot setting." + rm -f /boot/nextkernel +.endif DELETED nfsclient.init Index: nfsclient.init ================================================================== --- nfsclient.init +++ /dev/null @@ -1,11 +0,0 @@ -# vim:ft=make: - -NFSCLIENT_ENABLE?=no - -.if empty(NFSCLIENT_ENABLE:tl:Mno) -DAEMON_rpcbind_ENABLE=yes -.endif - -nfsclient: NETWORK rpcbind rpc_umntall -.export NFSCLIENT_ENABLE - test -z "$${NFSCLIENT_ENABLE}" || kldload -n nfs ADDED nfsclient.init.mk Index: nfsclient.init.mk ================================================================== --- /dev/null +++ nfsclient.init.mk @@ -0,0 +1,8 @@ +NFSCLIENT_ENABLE?=no + +.if empty(NFSCLIENT_ENABLE:tl:Mno) +DAEMON_rpcbind_ENABLE=yes +.endif + +nfsclient: NETWORK rpcbind rpc_umntall + test -z "$${NFSCLIENT_ENABLE}" || kldload -n nfs DELETED nfsd.service Index: nfsd.service ================================================================== --- nfsd.service +++ /dev/null @@ -1,15 +0,0 @@ -# vim:ft=make: - -DAEMON_nfsd_COMMAND?=/sbin/nfsd -DAEMON_nfsd_ENABLE?=no -DAEMON_nfsd_FLAGS?=-u -t -n 4 - -.if empty(DAEMON_nfsd_ENABLE:tl:Mno) -DAEMON_rpcbind_ENABLE=yes -DAEMON_mountd_ENABLE=yes -.endif - -nfsd: mountd _service rpcbind -.if empty(NFS_RESERVED_PORT_ONLY:tl:Mno) - sysctl vfs.nfs.nfs_privport=1 -.endif ADDED nfsd.service.mk Index: nfsd.service.mk ================================================================== --- /dev/null +++ nfsd.service.mk @@ -0,0 +1,13 @@ +DAEMON_nfsd_COMMAND?=/sbin/nfsd +DAEMON_nfsd_ENABLE?=no +DAEMON_nfsd_FLAGS?=-u -t -n 4 + +.if empty(DAEMON_nfsd_ENABLE:tl:Mno) +DAEMON_rpcbind_ENABLE=yes +DAEMON_mountd_ENABLE=yes +.endif + +nfsd: mountd _service rpcbind +.if empty(NFS_RESERVED_PORT_ONLY:tl:Mno) + sysctl vfs.nfs.nfs_privport=1 +.endif DELETED node_exporter.service Index: node_exporter.service ================================================================== --- node_exporter.service +++ /dev/null @@ -1,13 +0,0 @@ -# vim:ft=make: - -DAEMON_node_exporter_COMMAND?=/usr/local/bin/node_exporter --web.listen-address=${DAEMON_node_exporter_LISTEN_ADDRESS} --collector.textfile.directory=${DAEMON_node_exporter_TEXTFILE_DIR} -DAEMON_node_exporter_ENABLE?=no -DAEMON_node_exporter_LISTEN_ADDRESS?=:9100 -DAEMON_node_exporter_TEXTFILE_DIR?=/var/tmp/node_exporter -DAEMON_node_exporter_USER?=nobody -DAEMON_node_exporter_GROUP?=nobody - -node_exporter: _service -.export DAEMON_$@_ENABLE - test -z "$${DAEMON_$@_ENABLE}" || \ - install -d -o ${DAEMON_node_exporter_USER} -g ${DAEMON_node_exporter_GROUP} -m1755 ${DAEMON_node_exporter_TEXTFILE_DIR} ADDED node_exporter.service.mk Index: node_exporter.service.mk ================================================================== --- /dev/null +++ node_exporter.service.mk @@ -0,0 +1,10 @@ +DAEMON_node_exporter_COMMAND?=/usr/local/bin/node_exporter --web.listen-address=${DAEMON_node_exporter_LISTEN_ADDRESS} --collector.textfile.directory=${DAEMON_node_exporter_TEXTFILE_DIR} +DAEMON_node_exporter_ENABLE?=no +DAEMON_node_exporter_LISTEN_ADDRESS?=:9100 +DAEMON_node_exporter_TEXTFILE_DIR?=/var/tmp/node_exporter +DAEMON_node_exporter_USER?=nobody +DAEMON_node_exporter_GROUP?=nobody + +node_exporter: _service + test -z "$${DAEMON_$@_ENABLE}" || \ + install -d -o ${DAEMON_node_exporter_USER} -g ${DAEMON_node_exporter_GROUP} -m1755 ${DAEMON_node_exporter_TEXTFILE_DIR} Index: plain.starter.mk ================================================================== --- plain.starter.mk +++ plain.starter.mk @@ -5,10 +5,11 @@ .endif .for target in ${LOCAL_TARGETS} ${target}: ${target:C/_service.*/DAEMON/:C/_earlyservice.*/SERVICE/} .USE test -z "$${DAEMON_$@_ENABLE}" || { \ + echo "MRC:$@> Starting service."; \ test -n "${DAEMON_$@_MODULES}" && kldload -n ${DAEMON_$@_MODULES} || true; \ chroot -u ${DAEMON_$@_USER:Uroot} -g ${DAEMON_$@_GROUP:Uwheel} / ${DAEMON_$@_COMMAND} ${DAEMON_$@_FLAGS}; \ } .endfor DELETED pwcheck.init Index: pwcheck.init ================================================================== --- pwcheck.init +++ /dev/null @@ -1,7 +0,0 @@ -# vim:ft=make: - -pwcheck: mountlate syslogd - : Checking password lock file. -.if exists(/etc/ptmp) - logger -s -p auth.err "password file may be incorrect -- /etc/ptmp exists" -.endif ADDED pwcheck.init.mk Index: pwcheck.init.mk ================================================================== --- /dev/null +++ pwcheck.init.mk @@ -0,0 +1,5 @@ +pwcheck: mountlate syslogd + echo "MRC:$@> Checking password lock file." +.if exists(/etc/ptmp) + logger -s -p auth.err "password file may be incorrect -- /etc/ptmp exists" +.endif DELETED random.init Index: random.init ================================================================== --- random.init +++ /dev/null @@ -1,18 +0,0 @@ -# vim:ft=make: - -ENTROPY_FILE?=/var/db/entropy/random -ENTROPY_DIR?=/var/db/entropy - -random: mount devfs - : Seeding random. - sysctl kern.seedenable=1 > /dev/null - ( ps -fauxww; ${SYSCTL} -a; date; df -ib; dmesg; ps -fauxww; ) 2>&1 | dd status=none of=/dev/random bs=8k - cat /bin/ls | dd status=none of=/dev/random bs=8k -.if exists(ENTROPY_DIR) -.for file in ${:!find ${ENTROPY_DIR} -type f!} - dd status=none if=${file} of=/dev/random bs=8k -.endfor -.elif exists(ENTROPY_FILE) - dd status=none if=${ENTROPY_FILE} of=/dev/random bs=8k -.endif - sysctl kern.seedenable=0 > /dev/null ADDED random.init.mk Index: random.init.mk ================================================================== --- /dev/null +++ random.init.mk @@ -0,0 +1,16 @@ +ENTROPY_FILE?=/var/db/entropy/random +ENTROPY_DIR?=/var/db/entropy + +random: mount devfs + echo "MRC:$@> Seeding." + sysctl kern.seedenable=1 > /dev/null + ( ps -fauxww; ${SYSCTL} -a; date; df -ib; dmesg; ps -fauxww; ) 2>&1 | dd status=none of=/dev/random bs=8k + cat /bin/ls | dd status=none of=/dev/random bs=8k +.if exists(ENTROPY_DIR) +.for file in ${:!find ${ENTROPY_DIR} -type f!} + dd status=none if=${file} of=/dev/random bs=8k +.endfor +.elif exists(ENTROPY_FILE) + dd status=none if=${ENTROPY_FILE} of=/dev/random bs=8k +.endif + sysctl kern.seedenable=0 > /dev/null DELETED root.init Index: root.init ================================================================== --- root.init +++ /dev/null @@ -1,6 +0,0 @@ -# vim:ft=make: - -root: fsck bootfs - : Mount root R/W. - mount -uo rw / - umount -a ADDED root.init.mk Index: root.init.mk ================================================================== --- /dev/null +++ root.init.mk @@ -0,0 +1,4 @@ +root: fsck bootfs + echo "MRC:$@> Mount root R/W." + mount -uo rw / + umount -a DELETED rpc_umntall.init Index: rpc_umntall.init ================================================================== --- rpc_umntall.init +++ /dev/null @@ -1,7 +0,0 @@ -# vim:ft=make: - -rpc_umntall: mountlate NETWORK rpcbind -.if empty(RPC_UMNTALL_ENABLE:tl:Mno) - test -f /var/db/mounttab || true && \ - rpc.umntall -k & -.endif ADDED rpc_umntall.init.mk Index: rpc_umntall.init.mk ================================================================== --- /dev/null +++ rpc_umntall.init.mk @@ -0,0 +1,6 @@ +rpc_umntall: mountlate NETWORK rpcbind +.if empty(RPC_UMNTALL_ENABLE:tl:Mno) + echo "MRC:$@> Sending RPC unmount notifications."; \ + test -f /var/db/mounttab || true && \ + rpc.umntall -k & +.endif DELETED rpcbind.service Index: rpcbind.service ================================================================== --- rpcbind.service +++ /dev/null @@ -1,7 +0,0 @@ -# vim:ft=make: - -DAEMON_rpcbind_COMMAND?=/usr/sbin/rpcbind -DAEMON_rpcbind_ENABLE?=no -DAEMON_rpcbind_FLAGS?=-d - -rpcbind: _earlyservice NETWORK syslogd ADDED rpcbind.service.mk Index: rpcbind.service.mk ================================================================== --- /dev/null +++ rpcbind.service.mk @@ -0,0 +1,5 @@ +DAEMON_rpcbind_COMMAND?=/usr/sbin/rpcbind +DAEMON_rpcbind_ENABLE?=no +DAEMON_rpcbind_FLAGS?=-d + +rpcbind: _earlyservice NETWORK syslogd DELETED runshm.init Index: runshm.init ================================================================== --- runshm.init +++ /dev/null @@ -1,7 +0,0 @@ -# vim:ft=make: - -runshm: cleanvar - : Mount and populate /var/run/shm. - mkdir -p /var/run/shm - mount_tmpfs -m 01777 dummy /var/run/shm - mkdir -p -m 01777 /var/run/shm/tmp ADDED runshm.init.mk Index: runshm.init.mk ================================================================== --- /dev/null +++ runshm.init.mk @@ -0,0 +1,5 @@ +runshm: cleanvar + echo "MRC:$@> Mount and populate /var/run/shm."; \ + mkdir -p /var/run/shm; \ + mount_tmpfs -m 01777 dummy /var/run/shm; \ + mkdir -p -m 01777 /var/run/shm/tmp; \ DELETED savecore.init Index: savecore.init ================================================================== --- savecore.init +++ /dev/null @@ -1,13 +0,0 @@ -# vim:ft=make: - -DUMPDIR?=/var/crash -CRASHINFO_ENABLE?=no - -savecore: dumpon -.if empty(DUMPDEV:tl:Mno) && exists(${DUMPDEV}) && exists(${DUMPDIR}) - : Saving coredump. - savecore ${DUMPDIR} ${DUMPDEV} -.if empty(CRASHINFO_ENABLE:tl:Mno) - crashinfo -d ${DUMPDIR} -.endif -.endif ADDED savecore.init.mk Index: savecore.init.mk ================================================================== --- /dev/null +++ savecore.init.mk @@ -0,0 +1,11 @@ +DUMPDIR?=/var/crash +CRASHINFO_ENABLE?=no + +savecore: dumpon +.if empty(DUMPDEV:tl:Mno) && exists(${DUMPDEV}) && exists(${DUMPDIR}) + echo "MRC:$@> Saving coredump."; \ + savecore ${DUMPDIR} ${DUMPDEV} +.if empty(CRASHINFO_ENABLE:tl:Mno) + crashinfo -d ${DUMPDIR} +.endif +.endif DELETED slim.service Index: slim.service ================================================================== --- slim.service +++ /dev/null @@ -1,7 +0,0 @@ -# vim:ft=make: - -DAEMON_slim_COMMAND?=/usr/local/bin/slim -DAEMON_slim_ENABLE?=no - -slim: _service dbus - rm -f /var/run/slim.auth ADDED slim.service.mk Index: slim.service.mk ================================================================== --- /dev/null +++ slim.service.mk @@ -0,0 +1,5 @@ +DAEMON_slim_COMMAND?=/usr/local/bin/slim +DAEMON_slim_ENABLE?=no + +slim: _service dbus + rm -f /var/run/slim.auth DELETED smartd.service Index: smartd.service ================================================================== --- smartd.service +++ /dev/null @@ -1,13 +0,0 @@ -# vim:ft=make: - -DAEMON_smartd_COMMAND?=/usr/local/sbin/smartd -DAEMON_smartd_ENABLE?=no -DAEMON_smartd_FLAGS?=-c /usr/local/etc/smartd.conf -n - -smartd: _service -.export DAEMON_$@_ENABLE - test -z "$${DAEMON_$@_ENABLE}" || \ - test -f /usr/local/etc/smartd.conf || { \ - echo smartd requires config file to start. ; \ - false; \ - } ADDED smartd.service.mk Index: smartd.service.mk ================================================================== --- /dev/null +++ smartd.service.mk @@ -0,0 +1,10 @@ +DAEMON_smartd_COMMAND?=/usr/local/sbin/smartd +DAEMON_smartd_ENABLE?=no +DAEMON_smartd_FLAGS?=-c /usr/local/etc/smartd.conf -n + +smartd: _service + test -z "$${DAEMON_$@_ENABLE}" || \ + test -f /usr/local/etc/smartd.conf || { \ + echo "MRC:$@> smartd requires config file to start." ; \ + false; \ + } DELETED sndiod.service Index: sndiod.service ================================================================== --- sndiod.service +++ /dev/null @@ -1,7 +0,0 @@ -# vim:ft=make: - -DAEMON_sndiod_COMMAND?=/usr/local/bin/sndiod -DAEMON_sndiod_ENABLE?=no -DAEMON_sndiod_FLAGS?=-c 0:7 -j off -s default -m mon -s monitor -d - -sndiod: _service ADDED sndiod.service.mk Index: sndiod.service.mk ================================================================== --- /dev/null +++ sndiod.service.mk @@ -0,0 +1,5 @@ +DAEMON_sndiod_COMMAND?=/usr/local/bin/sndiod +DAEMON_sndiod_ENABLE?=no +DAEMON_sndiod_FLAGS?=-c 0:7 -j off -s default -m mon -s monitor -d + +sndiod: _service Index: svc.starter.mk ================================================================== --- svc.starter.mk +++ svc.starter.mk @@ -5,10 +5,11 @@ .endif .for target in ${LOCAL_TARGETS} ${target}: ${target:C/_service.*/DAEMON/:C/_earlyservice/SERVICE/} .USE test -z "$${DAEMON_$@_ENABLE}" || { \ + echo "MRC:$@> Starting service."; \ test -n "${DAEMON_$@_MODULES}" && kldload -n ${DAEMON_$@_MODULES} || true; \ svc -u ${DAEMON_$@_USER:Uroot} -g ${DAEMON_$@_GROUP:Uwheel} init $@ ${DAEMON_$@_COMMAND} ${DAEMON_$@_FLAGS}; \ } .endfor DELETED swap.init Index: swap.init ================================================================== --- swap.init +++ /dev/null @@ -1,7 +0,0 @@ -# vim:ft=make: - -swap: savecore -.if ${:!sysctl -n vm.swap_enabled!}} != 0 - : Enabling swap. - swapon -a -.endif ADDED swap.init.mk Index: swap.init.mk ================================================================== --- /dev/null +++ swap.init.mk @@ -0,0 +1,5 @@ +swap: savecore +.if ${:!sysctl -n vm.swap_enabled!}} != 0 + echo "MRC:$@> Enabling swap."; \ + swapon -a +.endif DELETED sysctl.init Index: sysctl.init ================================================================== --- sysctl.init +++ /dev/null @@ -1,7 +0,0 @@ -# vim:ft=make: - -sysctl: kld root -.if exists(/etc/sysctl.conf) - : Setting sysctl defaults. - awk '$$0~/^[ ]*(#.*)?$$/{next}{print}' < /etc/sysctl.conf | xargs -n1 sysctl -.endif ADDED sysctl.init.mk Index: sysctl.init.mk ================================================================== --- /dev/null +++ sysctl.init.mk @@ -0,0 +1,5 @@ +sysctl: kld root +.if exists(/etc/sysctl.conf) + echo "MRC:$@> Setting sysctl defaults."; \ + awk '$$0~/^[ ]*(#.*)?$$/{next}{print}' < /etc/sysctl.conf | xargs -n1 sysctl +.endif DELETED sysdb.init Index: sysdb.init ================================================================== --- sysdb.init +++ /dev/null @@ -1,6 +0,0 @@ -# vim:ft=make: - -sysdb: mountlate - : Building databases. - dev_mkdb - install -c -m 644 -g wheel /dev/null /var/run/utmpx ADDED sysdb.init.mk Index: sysdb.init.mk ================================================================== --- /dev/null +++ sysdb.init.mk @@ -0,0 +1,4 @@ +sysdb: mountlate + echo "MRC:$@> Building databases."; \ + dev_mkdb; \ + install -c -m 644 -g wheel /dev/null /var/run/utmpx DELETED syslogd.service Index: syslogd.service ================================================================== --- syslogd.service +++ /dev/null @@ -1,7 +0,0 @@ -# vim:ft=make: - -DAEMON_syslogd_COMMAND?=/usr/sbin/syslogd -DAEMON_syslogd_ENABLE?=yes -DAEMON_syslogd_FLAGS?=-ss8cc - -syslogd: _earlyservice ADDED syslogd.service.mk Index: syslogd.service.mk ================================================================== --- /dev/null +++ syslogd.service.mk @@ -0,0 +1,5 @@ +DAEMON_syslogd_COMMAND?=/usr/sbin/syslogd +DAEMON_syslogd_ENABLE?=yes +DAEMON_syslogd_FLAGS?=-ss8cc + +syslogd: _earlyservice DELETED watchdogd.service Index: watchdogd.service ================================================================== --- watchdogd.service +++ /dev/null @@ -1,11 +0,0 @@ -# vim:ft=make: - -DAEMON_watchdogd_COMMAND?=/usr/sbin/watchdogd -DAEMON_watchdogd_ENABLE?=no -DAEMON_watchdogd_FLAGS?=-d - -.if empty(:!sysctl -qn debug.watchdog || exit 0!) -DAEMON_watchdogd_ENABLE=no -.endif - -watchdogd: _earlyservice ADDED watchdogd.service.mk Index: watchdogd.service.mk ================================================================== --- /dev/null +++ watchdogd.service.mk @@ -0,0 +1,9 @@ +DAEMON_watchdogd_COMMAND?=/usr/sbin/watchdogd +DAEMON_watchdogd_ENABLE?=no +DAEMON_watchdogd_FLAGS?=-d + +.if empty(:!sysctl -qn debug.watchdog || exit 0!) +DAEMON_watchdogd_ENABLE=no +.endif + +watchdogd: _earlyservice DELETED wlans.init Index: wlans.init ================================================================== --- wlans.init +++ /dev/null @@ -1,12 +0,0 @@ -# vim:ft=make: - -wlans: kld - : Configuring wlans. - for dev in `sysctl -n net.wlan.devices`; do \ - eval all_wlans=\$${WLANS_$${dev}}; \ - for wlan in $${all_wlans}; do \ - eval wlan_args=\$${WLANS_$${wlan}_ARGS}; \ - ifconfig $${wlan} create wlandev $${dev} $${wlan_args}; \ - ifconfig $${wlan} up; \ - done; \ - done ADDED wlans.init.mk Index: wlans.init.mk ================================================================== --- /dev/null +++ wlans.init.mk @@ -0,0 +1,10 @@ +wlans: kld + echo "MRC:$@> Configuring wlans."; \ + for dev in `sysctl -n net.wlan.devices`; do \ + eval all_wlans=\$${WLANS_$${dev}}; \ + for wlan in $${all_wlans}; do \ + eval wlan_args=\$${WLANS_$${wlan}_ARGS}; \ + ifconfig $${wlan} create wlandev $${dev} $${wlan_args}; \ + ifconfig $${wlan} up; \ + done; \ + done