Overview
Comment: | create defaults file, mark conditions for later, remove default mrc.conf |
---|---|
Downloads: | Tarball | ZIP archive | SQL archive |
Timelines: | family | ancestors | descendants | both | trunk |
Files: | files | file ages | folders |
SHA3-256: |
88e0b45310e8db941bd366055d8eeb77 |
User & Date: | arcade on 2019-10-23 09:40:23.466 |
Other Links: | manifest | tags |
Context
2019-10-24
| ||
10:30 | silence cleanvar error check-in: 527b45759d user: arcade tags: trunk | |
2019-10-23
| ||
09:40 | create defaults file, mark conditions for later, remove default mrc.conf check-in: 88e0b45310 user: arcade tags: trunk | |
08:44 | fix multiline check-in: 5f60bcc749 user: arcade tags: trunk | |
Changes
Modified Makefile
from [44989b1c60]
to [a202ff1787].
1 2 3 4 5 6 7 | .include "/etc/mrc.mk" .export OTHER_TARGETS:=_service _earlyservice STARTER?=svc .for starter in ${:!find /etc/mrc -name '*.starter.mk'!:S/\/etc\/mrc\///} | > | 1 2 3 4 5 6 7 8 | .include "defaults.mk" .include "/etc/mrc.mk" .export OTHER_TARGETS:=_service _earlyservice STARTER?=svc .for starter in ${:!find /etc/mrc -name '*.starter.mk'!:S/\/etc\/mrc\///} |
︙ | ︙ |
Added defaults.mk version [78baea2e29].
Modified init.mk
from [e3d5ee5d05]
to [5b6a761119].
︙ | ︙ | |||
18 19 20 21 22 23 24 | echo "MRC:$@> Adjust kernel timezone." adjkerntz -i bootfs: fsck echo "MRC:$@> Checking whether we need /boot mounted." mount -vadr | grep -q ' /boot$$' && mount -r /boot || true | < < > | < < < > | < > > | 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 | echo "MRC:$@> Adjust kernel timezone." adjkerntz -i bootfs: fsck echo "MRC:$@> Checking whether we need /boot mounted." mount -vadr | grep -q ' /boot$$' && mount -r /boot || true 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 cleartmp: mountlate echo "MRC:$@> Clearing tmp."; \ find -x /tmp -mindepth 1 ! -name lost+found \ ! -name snapshots ! -path "./snapshots/*" \ ! -name quota.user ! -name quota.group \ -delete -type d -prune ;\ rm -f /tmp/.X*-lock ;\ rm -fr /tmp/.X11-unix ;\ mkdir -m 1777 /tmp/.X11-unix cloned: kld .if !empty(CLONED_INTERFACES) echo "MRC:$@> Cloning interfaces: ${CLONED_INTERFACES}" .for iface in ${CLONED_INTERFACES} ifconfig ${iface} create .endfor .endif devfs: echo "MRC:$@> Applying rules: ${DEVFS_CONFIG_FILES}" .for file in ${DEVFS_CONFIG_FILES} .if exists(${file}) devfsctl -a -f ${file} .endif .endfor dmesg: mountlate .if !empty(DMESG_FILE) echo "MRC:$@> Writing dmesg." umask 022 ; dmesg -a >> ${DMESG_FILE} .endif dumpon: random .if !empty(DUMPDEV) test -e ${DUMPDEV} && { \ echo "MRC:$@> Setting dumpon device to ${DUMPDEV}"; \ dumpon -v ${DUMPDEV}; \ } || true .endif fsck: echo "MRC:$@> Checking disks." ;\ fsck -p ;\ case $$? in \ 0) ;; \ 2) exit 1 \ |
︙ | ︙ | |||
100 101 102 103 104 105 106 | 130) exit 1 \ ;; \ *) echo "Unknown error, help!" ;\ exit 1 \ ;; \ esac | < < < < < < < < | 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 | 130) exit 1 \ ;; \ *) echo "Unknown error, help!" ;\ exit 1 \ ;; \ esac hostname: echo "MRC:$@> Setting to ${HOSTNAME}." hostname ${HOSTNAME} ifconfig: adjkerntz wlans cloned kld echo "MRC:$@> Starting interfaces: ${IFCONFIG_IFACES}" .for iface in ${IFCONFIG_IFACES} .for item in ${IFCONFIG_${iface}:tW:ts;} ifconfig ${iface} ${item} .endfor .undef _IFCONFIG_ARGS .endfor kld: bootfs .if defined(KLD_LIST) echo "MRC:$@> Loading kernel modules: ${KLD_LIST}" kldload -n ${KLD_LIST} .endif .for path in ${LDCONFIG_PATHS} /etc/ld-elf.so.conf .if exists(${path}) ldc+=${path} .endif .endfor .for dir in ${LDCONFIG_LOCAL_DIRS} |
︙ | ︙ | |||
151 152 153 154 155 156 157 | 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 | < < < < < < < < < | | | < < < | 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 | 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 excludes=${NETFS_TYPES:C/:.*//} mount: root echo "MRC:$@> Mount local FS." mount -a -t no${excludes:ts,} mountlate: NETWORK mount cleanvar runshm devd echo "MRC:$@> Mount late FS." mount -a msgs: mount echo "MRC:$@> Making bounds." ;\ test ! -d /var/msgs -o -f /var/msgs/bound -o -L /var/msgs/bounds || \ echo 0 > /var/msgs/bounds newsyslog: mountlate sysdb test -z "$${NEWSYSLOG_ENABLE}" || \ echo "MRC:$@> Trimming log files." ;\ /usr/sbin/newsyslog ${NEWSYSLOG_FLAGS} nextboot: mount .if exists(/boot/nextkernel) echo "MRC:$@> Removing nextboot setting." rm -f /boot/nextkernel .endif .if empty(NFSCLIENT_ENABLE:tl:Mno) DAEMON_rpcbind_ENABLE=yes .endif nfsclient: NETWORK rpcbind rpc_umntall test -z "$${NFSCLIENT_ENABLE}" || kldload -n nfs 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 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) # XXX .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 root: fsck bootfs echo "MRC:$@> Mount root R/W." mount -uo rw / umount -a rpc_umntall: mountlate NETWORK rpcbind .if empty(RPC_UMNTALL_ENABLE:tl:Mno) # XXX echo "MRC:$@> Sending RPC unmount notifications."; \ test -f /var/db/mounttab || true && \ rpc.umntall -k & .endif 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; \ 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 |
︙ | ︙ |
Deleted mrc.conf version [636ba38911].