Check-in [8bc8c738d5]
Logged in as anonymous
Overview
Comment:mounttmpfs, change how service deps work
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA3-256: 8bc8c738d512799bfe1abab635d46109f66e4a00697c30af841b710bf30b407c
User & Date: arcade on 2022-05-31 08:15:44.489
Other Links: manifest | tags
Context
2022-05-31
09:21
add lldpd check-in: 1745e4d296 user: arcade tags: trunk
08:15
mounttmpfs, change how service deps work check-in: 8bc8c738d5 user: arcade tags: trunk
2022-05-30
21:16
fix ordering, test compat mode, new services check-in: 4d5a9b2632 user: arcade tags: trunk
Changes
Side-by-Side Diff Ignore Whitespace Patch
Modified Makefile from [1bdf848a85] to [b458798a0c].
︙
45
46
47
48
49
50
51
52

53
54
55
56
57
58
59

45
46
47
48
49
50
51

52
53
54
55
56
57
58
59








-
+








# Service creation targets
.	if !target(${service}_status)
${service}_status: ${_SERVICE_STATUS}
.	endif

# Service exit targets
.	if !target(${service}_exit)
${service}_exit: ${_SERVICE_EXIT}
${service}_exit: ${_SERVICE_EXIT} ${DAEMON_${service}_DEPS:S/$/_exit/}
.	endif

DAEMON_EXIT: ${service}_exit
.endfor

.MAIN: ${SCRIPTS} ${TARGETS}
︙
Modified dbus.service.mk from [51cc707737] to [380d229a4f]. 
1
2
3
4
5
6
7
8
9
10
11

1
2
3
4
5
6
7
8
9












-
-

DAEMON_dbus_COMMAND?=/usr/local/bin/dbus-daemon
DAEMON_dbus_ENABLE?=no
DAEMON_dbus_FLAGS?=--system --syslog
DAEMON_dbus_BACKGROUND?=--fork
DAEMON_dbus_FOREGROUND?=--nofork --nopidfile

dbus: ${_SERVICE}
	/usr/local/bin/dbus-uuidgen --ensure
	mkdir -p /var/run/dbus

dbus_exit: ${_SERVICE_EXIT} slim_exit
Modified defaults.mk from [14ef6a9951] to [f92202a134].
︙
56
57
58
59
60
61
62




63
64

56
57
58
59
60
61
62
63
64
65
66
67
68








+
+
+
+



# rpc_umntall
RPC_UMNTALL_ENABLE?=no

# savecore
CRASHINFO_ENABLE?=no
DUMPDIR?=/var/crash

# tmpfs
TMPFS_TMP_ENABLE?=no
TMPFS_VAR_RUN_ENABLE?=no

# zfs
ZFS_ENABLE?=no
Modified hotplugd.service.mk from [a1e2df85d4] to [5cc8af4e53]. 
1



2
3

1
2
3
4
5
6


+
+
+



DAEMON_hotplugd_COMMAND?=/usr/sbin/hotplugd

DAEMON_syslogd_DEPS+=hotplugd
DAEMON_udevd_DEPS+=hotplugd

hotplugd: ${_SERVICE} syslogd udevd
Modified init.mk from [86dd3c18d7] to [850c3a593a]. 
1
2
3
4
5
6

7
8
9
10
11
12
13

1
2
3
4
5

6
7
8
9
10
11
12
13






-
+








# Meta targets

TARGETS:=adjkerntz bootfs cleanvar cleartmp cloned devfs dmesg dumpon fsck \
	hostname kld ldconfig microcode mixer mount mountlate msgs netif \
	newsyslog nextboot nfsclient pf pwcheck random root runshm savecore swap \
	sysctl sysdb wlans zfs
	sysctl sysdb wlans zfs mounttmpfs utmpx

OTHER_TARGETS+=mixer_exit nfsclient_exit random_exit

DAEMON: pwcheck sysctl sysdb NETWORK SERVERS ldconfig nfsclient cleartmp pflogd

LOGIN: DAEMON dntpd msgs powerd pflogd
︙
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
78
79
80
81
82
83
84
85
86
87
88
89
90
91

92
93
94
95
96
97
98

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
78
79
80
81
82
83
84
85
86
87
88
89

90
91
92
93
94
95
96
97








-
+

+
-
+
+

-


-
-
+
+
-
-
-
+
+
-
-
-
+
+




















-
+





-
-
+
+

















-
+








	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."
	echo "MRC:$@> Cleaning '/var's."
.for dir in ${CLEANVAR_DIRS}
	if [ -d ${dir} ]; then \
	test -d ${dir} && find ${dir} -mindepth 1 -delete || true
		/rescue/find ${dir} -mindepth 1 -delete ;\
	fi
.endfor
	install -m644 /dev/null /var/run/utmpx

cleartmp: mountlate
	echo "MRC:$@> Clearing tmp."; \
	find -x /tmp -mindepth 1 ! -name lost+found \
	echo "MRC:$@> Clearing tmp."
	find -x /tmp -mindepth 1 ! -name lost+found ! -name snapshots \
			! -name snapshots ! -path "./snapshots/*" \
			! -name quota.user ! -name quota.group \
			-delete -type d -prune ;\
		! -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
	rm -fr /tmp/.X11-unix /tmp/.X*-lock
	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}
	( umask 022 ; dmesg -a > ${DMESG_FILE} ;)
.endif

dumpon: random
.if !empty(DUMPDEV)
	if [ -e ${DUMPDEV} ]; then \
		echo "MRC:$@> Setting dumpon device to ${DUMPDEV}"; \
		dumpon -v ${DUMPDEV}; \
		echo "MRC:$@> Setting dumpon device to ${DUMPDEV}" ;\
		dumpon -v ${DUMPDEV} ;\
	fi
.endif

fsck:
	echo "MRC:$@> Checking disks." ;\
	fsck -p ;\
	case $$? in \
	0) ;; \
	2) exit 1 \
		;; \
	4) echo "Rebooting..." ;\
		reboot ;\
		echo "Reboot failed; help!" ;\
		exit 1 \
		;; \
	8) if [ -n "$${FSCK_Y_ENABLE}" ]; then \
			echo "File system preen failed, trying fsck -y." ;\
			fsck -y || {\
			fsck -y || { \
				echo "Automatic file system check failed; help!" ;\
				exit 1 ;\
			} ;\
		else \
			echo "Automatic file system check failed; help!" ;\
			exit 1 ;\
		fi \
︙
169
170
171
172
173
174
175
176

177
178
179
180
181
182
183

168
169
170
171
172
173
174

175
176
177
178
179
180
181
182








-
+









mount: root zfs
	echo "MRC:$@> Mount local FS." ;\
	mount -uo rw -a ;\
	mount ;\
	mount -a -t no${excludes:ts,}

mountlate: NETWORK mount cleanvar runshm devd
mountlate: NETWORK mount cleanvar runshm devd mounttmpfs
	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
︙
208
209
210
211
212
213
214
215

216
217
218
219
220
221
222
223
224
225
226
227


228
229
230
231

232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250





251
252
253

254
255
256
257
258



259
260
261
262
263
264
265






266
267
268
269
270

271
272
273
274
275
276
277
278
279
280
281

282
283
284
285
286
287
288
289
290

291
292
293
294
295
296

297
298
299
300
301
302

303
304
305
306

307
308

309
310
311
312
313




314
315
316
317
318
319
320



321

























207
208
209
210
211
212
213

214
215
216
217
218
219
220
221
222
223
224


225
226
227
228
229

230
231
232
233
234
235
236
237
238
239
240
241
242
243
244





245
246
247
248
249
250
251

252
253
254



255
256
257
258
259
260




261
262
263
264
265
266
267
268
269
270

271
272
273






274
275

276
277
278
279
280
281
282
283
284

285
286
287
288
289
290

291
292
293
294
295
296

297
298
299
300

301
302

303
304




305
306
307
308
309
310
311
312



313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340








-
+










-
-
+
+



-
+














-
-
-
-
-
+
+
+
+
+


-
+


-
-
-
+
+
+



-
-
-
-
+
+
+
+
+
+




-
+


-
-
-
-
-
-


-
+








-
+





-
+





-
+



-
+

-
+

-
-
-
-
+
+
+
+




-
-
-
+
+
+

+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

	echo "MRC:$@> Sending RPC unmount notifications."; \
	test -f /var/db/mounttab || true && \
		rpc.umntall -k
.endif

NETWORK_EXIT: nfsclient_exit

netif: adjkerntz wlans cloned kld
netif: adjkerntz wlans cloned kld mounttmpfs utmpx
	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

pf: pflogd
.if empty(PF_ENABLE:tl:Mno)
	echo "MRC:$@> Enabling and loading rules." ;\
	kldload -n pf || exit 1 ;\
	echo "MRC:$@> Enabling and loading rules."
	kldload -n pf || exit 1
	if [ -r ${PF_RULES} ]; then \
		pfctl -Fa || exit 1 ;\
		pfctl -f ${PF_RULES} ${PF_FLAGS} || exit 1 ;\
		pfctl -Si | grep -q Enabled && pfctl -e; \
		pfctl -Si | grep -q Enabled && pfctl -e ;\
	else \
		echo "MRC:$@> Can't find file with rules at ${PF_RULES}." ;\
		exit 1 ;\
	fi
.endif

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 ;\
	dd if=/bin/ps status=none of=/dev/random bs=8k ;\
	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 2>/dev/null
	dd if=/bin/ps status=none of=/dev/random bs=8k 2>/dev/null
	if [ -d $${ENTROPY_DIR} ]; then \
		find $${ENTROPY_DIR} -type f |\
			xargs -n1 -Ifoo dd status=none if=foo of=/dev/random bs=8k ;\
			xargs -n1 -Ifoo dd status=none if=foo of=/dev/random bs=8k 2>/dev/null ;\
	else \
		if [ -r ${ENTROPY_FILE} ]; then \
			dd status=none if=${ENTROPY_FILE} of=/dev/random bs=8k ;\
		fi ;\
	fi ;\
			dd status=none if=${ENTROPY_FILE} of=/dev/random bs=8k 2>/dev/null ;\
		fi \
	fi
	sysctl kern.seedenable=0 > /dev/null

random_exit:
	rm -f ${ENTROPY_FILE}; \
	umask 077 && \
	dd if=/dev/random of=${ENTROPY_FILE} bs=8k count=1 || \
		echo "MRC:$@> entropy file write failed."
	rm -f ${ENTROPY_FILE}
	( \
		umask 077 ;\
		dd if=/dev/random of=${ENTROPY_FILE} bs=8k count=1 2>/dev/null || \
			echo "MRC:$@> entropy file write failed." ;\
	)

DAEMON_EXIT: random_exit

root: fsck bootfs
	echo "MRC:$@> Mount root R/W." ;\
	echo "MRC:$@> Mount root R/W."
	mount -uo rw

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."; \
	echo "MRC:$@> Saving coredump."
	savecore ${DUMPDIR} ${DUMPDEV}
.if empty(CRASHINFO_ENABLE:tl:Mno)
	crashinfo -d ${DUMPDIR}
.endif
.endif

swap: savecore
.if ${:!sysctl -n vm.swap_enabled!}} != 0
	echo "MRC:$@> Enabling swap."; \
	echo "MRC:$@> Enabling swap."
	swapon -a
.endif

sysctl: kld root
.if exists(/etc/sysctl.conf)
	echo "MRC:$@> Setting sysctl defaults."; \
	echo "MRC:$@> Setting sysctl defaults."
	awk '$$0~/^[ ]*(#.*)?$$/{next}{print}' < /etc/sysctl.conf | \
		xargs -n1 sysctl
.endif

sysdb: mountlate
	echo "MRC:$@> Building databases."; \
	echo "MRC:$@> Building databases."
	install -c -m 644 -g wheel /dev/null /var/run/utmpx

wlans: kld
	echo "MRC:$@> Configuring wlans."; \
	echo "MRC:$@> Configuring wlans."
	for dev in $$(sysctl -n net.wlan.devices); do \
		eval all_wlans=\$${WLANS_$${dev}}; \
		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; \
			eval wlan_args=\$${WLANS_$${wlan}_ARGS} ;\
			ifconfig $${wlan} create wlandev $${dev} $${wlan_args} ;\
			ifconfig $${wlan} up ;\
		done \
	done

zfs:
.if empty(ZFS_ENABLE:tl:Mno)
	zfs mount -va || exit $$? ;\
	zfs share -a || exit $$? ;\
	test -r /etc/zfs/exports || touch /etc/zfs/exports
	zfs mount -va || exit $$?
	zfs share -a || exit $$?
	touch /etc/zfs/exports
.endif

runshm: cleanvar
	echo "MRC:$@> Preparing /var/run."
.	if exists(TMPFS_VAR_RUN_ENABLE)
	/rescue/find /var/run -mindepth 1 -delete
	mount_tmpfs dummy /var/run
.	else
	mkdir -p /var/run/shm
	mount_tmpfs -m 01777 dummy /var/run/shm
.	endif
	mtree -deiqU -f /etc/mtree/BSD.var.dist -p /var

mounttmpfs: cleanvar
	echo "MRC:$@> Mount tmpfs and populating /var/run."
.if exists(TMPFS_TMP_ENABLE)
	mount | awk 'BEGIN{x=1}$$3~/\/tmp/{x=0}END{exit(x)}' || {
		/rescue/find /tmp -mindepth 1 -delete
		mount_tmpfs -m 01777 dummy /tmp
	}
.endif

utmpx: runshm
	echo "MRC:$@> Install utmpx."
	install -m 644 -g wheel /dev/null /var/run/utmpx
Modified mountd.service.mk from [df85e60013] to [9f79d9ca37]. 
1
2
3
4
5
6


7
8
9
10
11
12
13
14
15
16

1
2
3
4
5
6
7
8
9
10
11
12
13
14
15


16







+
+







-
-


DAEMON_mountd_COMMAND?=/sbin/mountd
DAEMON_mountd_ENABLE?=no
DAEMON_mountd_FLAGS?=-r

.if empty(DAEMON_mountd_ENABLE:tl:Mno)
DAEMON_rpcbind_ENABLE=yes

DAEMON_rpcbind_DEPS+=mountd
.endif

mountd: rpcbind NETWORK SERVERS ${_SERVICE} # mountlate -> SERVERS
	rm -f /var/db/mountdtab ;\
	( umask 022; touch /var/db/mountdtab; ) ;\
	:

mountd_exit: ${_SERVICE_EXIT} nfsd_exit

NETWORK_EXIT: mountd_exit
Modified nfsd.service.mk from [db973c0dae] to [d3ca7a1eca]. 
1
2
3
4
5



6
7
8
9
10
11
12

1
2
3
4
5
6
7
8
9
10
11
12
13
14
15






+
+
+








DAEMON_nfsd_COMMAND?=/sbin/nfsd
DAEMON_nfsd_ENABLE?=no
DAEMON_nfsd_FLAGS?=-u -t -n 4

.if empty(DAEMON_nfsd_ENABLE:tl:Mno)
DAEMON_mountd_DEPS+=nfsd
DAEMON_rpcbind_DEPS+=nfsd

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
︙
Modified rc from [e3d809966a] to [457a883ade]. 
1
2
3
4
5
6
7
8
9
10
11
12

13
14
15
16
17
18
19

1
2
3
4
5
6
7
8
9
10
11

12
13
14
15
16
17
18
19












-
+








#!/sbin/sh -Tue -

stty status '^T'

trap : 2

HOME=/
PATH=/sbin:/bin:/usr/sbin:/usr/bin

export PATH HOME

MAKEINIT="make -D AUTOBOOT -C /etc/mrc"
MAKEINIT="make -D AUTOBOOT -C /etc/mrc -k"
NCPU=$((`/sbin/sysctl -n hw.ncpu` + 1 ))
#MAKEDEBUG="-d -nelLx"

mount -t tmpfs tmpfs /etc/mrc/tmp && ${MAKEINIT} -j ${NCPU} ${MAKEDEBUG} -X TMPDIR=/etc/mrc/tmp && umount /etc/mrc/tmp || ${MAKEINIT}

echo ''
date
︙
Modified rc.shutdown from [9336dbdccb] to [367b06024b]. 
1
2
3
4
5
6
7
8
9
10
11
12

13
14
15
16
17
18
19

1
2
3
4
5
6
7
8
9
10
11

12
13
14
15
16
17
18
19












-
+








#!/sbin/sh -Tue -

stty status '^T'

trap : 2

HOME=/
PATH=/sbin:/bin:/usr/sbin:/usr/bin

export PATH HOME

MAKEINIT="make -D AUTOBOOT -C /etc/mrc"
MAKEINIT="make -D AUTOBOOT -C /etc/mrc -k"
NCPU=$((`/sbin/sysctl -n hw.ncpu` + 1 ))
#MAKEDEBUG="-d -nelLx"

mount -t tmpfs tmpfs /etc/mrc/tmp && ${MAKEINIT} -j ${NCPU} ${MAKEDEBUG} -X TMPDIR=/etc/mrc/tmp EXIT && umount /etc/mrc/tmp || ${MAKEINIT} EXIT

echo '.'
exit 0
Modified rpcbind.service.mk from [4878be3bb2] to [4cd8bdc353]. 
1
2
3
4
5

6
7

8
9

1
2
3
4

5
6

7
8
9





-
+

-
+



DAEMON_rpcbind_COMMAND?=/usr/sbin/rpcbind
DAEMON_rpcbind_ENABLE?=no
DAEMON_rpcbind_FLAGS?=-d

rpcbind: ${_EARLYSERVICE} NETWORK syslogd
DAEMON_syslogd_DEPS+=rpcbind

rpcbind_exit: ${_SERVICE_EXIT} mountd_exit nfsd_exit
rpcbind: ${_EARLYSERVICE} NETWORK syslogd

NETWORK_EXIT: rpcbind_exit
Modified sensorsd.service.mk from [9b79256b5c] to [bd0866954b]. 
1
2


3
4

1
2
3
4
5
6



+
+



DAEMON_sensorsd_COMMAND?=/usr/sbin/sensorsd
DAEMON_sensorsd_FOREGROUND?=-d

DAEMON_syslogd_DEPS+=sensorsd

sensorsd: ${_SERVICE} syslogd
Modified slim.service.mk from [80c5fff957] to [cf841331ae]. 
1
2
3


4
5
6
7
8

1
2
3
4
5
6
7
8
9
10




+
+






DAEMON_slim_COMMAND?=/usr/local/bin/slim
DAEMON_slim_ENABLE?=no
DAEMON_slim_BACKGROUND?=-d

DAEMON_dbus_DEPS+=slim

slim: ${_SERVICE} dbus
	rm -f /var/run/slim.auth

DAEMON_EXIT: slim_exit
Modified syslogd.service.mk from [5c15e6769b] to [2af8352b9f]. 
1
2
3
4
5
6
7

1
2
3
4
5








-
-

DAEMON_syslogd_COMMAND?=/usr/sbin/syslogd
DAEMON_syslogd_ENABLE?=yes
DAEMON_syslogd_FLAGS?=-ss8cc

syslogd: ${_EARLYSERVICE} newsyslog

syslogd_exit: ${_SERVICE_EXIT} sensorsd_exit hotplugd_exit
Modified udevd.service.mk from [31edaedf48] to [a18868cdc5]. 
1
2
3
4
5
6
7

1
2
3
4
5








-
-

DAEMON_udevd_COMMAND?=/sbin/udevd
DAEMON_udevd_ENABLE?=yes
DAEMON_udevd_FOREGROUND?=-d

udevd: ${_EARLYSERVICE}

udevd_exit: ${_SERVICE_EXIT} hotplugd_exit