Check-in [47c6cc1171]
Logged in as anonymous
Overview
Comment:fix variables, fix execution order
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA3-256: 47c6cc117157dd0cbdb9e38872c5e03ba93f039f67c9ff9ac272262858549f46
User & Date: arcade on 2019-10-20 11:54:13.641
Other Links: manifest | tags
Context
2019-10-20
12:27
rewrite file check-in: 3e8f3b3326 user: arcade tags: trunk
11:54
fix variables, fix execution order check-in: 47c6cc1171 user: arcade tags: trunk
11:29
calculate targets once, add crash handler check-in: f95fc3334e user: arcade tags: trunk
Changes
Unified Diff Ignore Whitespace Patch
Modified Makefile from [4386fe9b60] to [af62bbb687]. 
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33

.include "/etc/mrc.conf"
.export

DAEMONIZER?=svc.daemon

#.MAKE.JOBS?=2
#.SILENT:

.include "${DAEMONIZER}"

.if defined(AUTOBOOT)
SCRIPTS=${:!find /etc/mrc -name '*.init' -o -name '*.service'!: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\///}

DAEMON:
.endif

TARGETS=${SCRIPTS:S/.init//:S/.service//}

.MAIN: ${TARGETS}

.PHONY: ${TARGETS} _daemon _service

.for file in ${SCRIPTS}
.include "${file}"
.endfor







|

















|









1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33

.include "/etc/mrc.conf"
.export

DAEMONIZER?=svc.daemon

#.MAKE.JOBS?=2
.SILENT:

.include "${DAEMONIZER}"

.if defined(AUTOBOOT)
SCRIPTS=${:!find /etc/mrc -name '*.init' -o -name '*.service'!: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\///}

DAEMON:
.endif

TARGETS:=${SCRIPTS:S/.init//:S/.service//}

.MAIN: ${TARGETS}

.PHONY: ${TARGETS} _daemon _service

.for file in ${SCRIPTS}
.include "${file}"
.endfor
Modified cron.service from [7d5ed3db1d] to [ac701026a0]. 
1
2
3
4
5
6

# vim:ft=make:

DAEMON_cron_COMMAND?=cron
DAEMON_cron_FLAGS?=-s

cron: _service LOGIN



|




1
2
3
4
5
6

# vim:ft=make:

DAEMON_cron_COMMAND?=/usr/sbin/cron
DAEMON_cron_FLAGS?=-s

cron: _service LOGIN
Modified devd.service from [2f2a9e327e] to [1b9276dca0]. 
1
2
3
4
5
6
7
8
9

# vim:ft=make:

DAEMON_devd_COMMAND?=devd
DAEMON_devd_FLAGS?=-dq

devd: _service ifconfig
.if !empty(${DAEMON_devd_ENABLE:tl:Mno})
	sysctl hw.bus.devctl_disable=1
.endif



|



|



1
2
3
4
5
6
7
8
9

# vim:ft=make:

DAEMON_devd_COMMAND?=/sbin/devd
DAEMON_devd_FLAGS?=-dq

devd: _service ifconfig
.if !empty(DAEMON_devd_ENABLE:tl:Mno)
	sysctl hw.bus.devctl_disable=1
.endif
Modified dhcpcd.service from [8c517cfb42] to [bbafbc6644]. 
1
2
3
4
5
6
7

# vim:ft=make:

DAEMON_dhcpcd_COMMAND?=dhcpcd
DAEMON_dhcpcd_ENABLE?=no
DAEMON_dhcpcd_FLAGS?=-B

dhcpcd: _service mount cleanvar ifconfig



|





1
2
3
4
5
6
7

# vim:ft=make:

DAEMON_dhcpcd_COMMAND?=/sbin/dhcpcd
DAEMON_dhcpcd_ENABLE?=no
DAEMON_dhcpcd_FLAGS?=-B

dhcpcd: _service mount cleanvar ifconfig
Modified dntpd.service from [af96dfc218] to [3a00bb5eee]. 
1
2
3
4
5
6

# vim:ft=make:

DAEMON_dntpd_COMMAND?=dntpd
DAEMON_dntpd_FLAGS?=-F

dntpd: _service NETWORK



|




1
2
3
4
5
6

# vim:ft=make:

DAEMON_dntpd_COMMAND?=/usr/sbin/dntpd
DAEMON_dntpd_FLAGS?=-F

dntpd: _service NETWORK
Modified dumpon.init from [c73d66f500] to [dbaf344ef8]. 
1
2
3
4
5
6
7
8
9

# vim:ft=make:

DUMPDEV?=no

dumpon: random
.if empty(${DUMPDEV:tl:Mno})
	: Setting dumpon device.
	: dumpon -v ${DUMPDEV}
.endif






|

|


1
2
3
4
5
6
7
8
9

# vim:ft=make:

DUMPDEV?=no

dumpon: random
.if empty(DUMPDEV:tl:Mno)
	: Setting dumpon device.
	dumpon -v ${DUMPDEV}
.endif
Modified mixer.init from [325c8177c4] to [8a21860450]. 
1
2
3
4
5
6
7
8
9
10
11

# vim:ft=make:

mixers=${:!find /dev -name 'mixer*'!:S/\/dev\///}

mixer: mount cleanvar
	: Restoring mixer levels.
.for mixer in ${mixers}
.if exists(/var/db/${mixer}-state)
	mixer -f /dev/${mixer} `cat /var/db/${mixer}-state`
.endif
.endfor








<
|
<


1
2
3
4
5
6
7

8

9

# 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
Modified node_exporter.service from [9ffe51c156] to [431e8dfb71]. 
1
2
3
4
5
6
7
8
9
10
11
12
13

# 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: _daemon
.if !exists(DAEMON_node_exporter_TEXTFILE_DIR)
	install -d -o ${DAEMON_node_exporter_USER} -g ${DAEMON_node_exporter_GROUP} -m1755 ${DAEMON_node_exporter_TEXTFILE_DIR}
.endif











<

<

1
2
3
4
5
6
7
8
9
10

11


# 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: _daemon

	install -d -o ${DAEMON_node_exporter_USER} -g ${DAEMON_node_exporter_GROUP} -m1755 ${DAEMON_node_exporter_TEXTFILE_DIR}
Modified savecore.init from [d49d844a3e] to [2a0acaa9dd]. 
1
2
3
4
5
6
7
8
9
10
11
12
13

# 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







|


|




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

# 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
Modified smartd.service from [2fb9fdcabe] to [b95945ce0e]. 
1
2
3
4
5
6

7
8
9
10
11
12

# vim:ft=make:

DAEMON_smartd_COMMAND?=/usr/local/sbin/smartd
DAEMON_smartd_ENABLE?=no
DAEMON_smartd_FLAGS?=-c /usr/local/etc/smartd.conf -n


.if !exists(/usr/local/etc/smartd.conf)
DAEMON_smartd_ENABLE=no
.info smartd requires config file to start
.endif

smartd: _daemon







>
|
<
|
<
|
<

1
2
3
4
5
6
7
8

9

10


# 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: _daemon
	test -d /usr/local/etc/smartd.conf || { \

	  echo smartd requires config file to start. ; \

	  exit 0 ; }
Modified svc.daemon from [bbc5c123bb] to [bdcbd6ec22]. 
1
2
3
4
5
6
7
8
9
10
11

# vim:ft=make:

_daemon: DAEMON .USE
.if empty(${DAEMON_$@_ENABLE:tl:Mno})
	svc -u ${DAEMON_$@_USER:Uroot} -g ${DAEMON_$@_GROUP:Uwheel} init $@ ${DAEMON_$@_COMMAND} ${DAEMON_$@_FLAGS}
.endif

_service: .USE
.if empty(${DAEMON_$@_ENABLE:tl:Mno})
	svc -u ${DAEMON_$@_USER:Uroot} -g ${DAEMON_$@_GROUP:Uwheel} init $@ ${DAEMON_$@_COMMAND} ${DAEMON_$@_FLAGS}
.endif




|




|



1
2
3
4
5
6
7
8
9
10
11

# vim:ft=make:

_daemon: DAEMON .USE
.if empty(DAEMON_$@_ENABLE:tl:Mno)
	svc -u ${DAEMON_$@_USER:Uroot} -g ${DAEMON_$@_GROUP:Uwheel} init $@ ${DAEMON_$@_COMMAND} ${DAEMON_$@_FLAGS}
.endif

_service: .USE
.if empty(DAEMON_$@_ENABLE:tl:Mno)
	svc -u ${DAEMON_$@_USER:Uroot} -g ${DAEMON_$@_GROUP:Uwheel} init $@ ${DAEMON_$@_COMMAND} ${DAEMON_$@_FLAGS}
.endif
Modified swap.init from [b62a1c192e] to [1f6b4316a8]. 
1
2
3
4
5
6
7
8
9

# vim:ft=make:

SWAP_ENABLED!=sysctl -n vm.swap_enabled

swap: savecore
.if ${SWAP_ENABLED} != 0
	: Enabling swap.
	swapon -a
.endif



<
<

|




1
2


3
4
5
6
7

# vim:ft=make:



swap: savecore
.if ${:!sysctl -n vm.swap_enabled!}} != 0
	: Enabling swap.
	swapon -a
.endif
Modified syslogd.service from [9b6d2920dc] to [ce75e745ae]. 
1
2
3
4
5
6

# vim:ft=make:

DAEMON_syslogd_COMMAND?=syslogd
DAEMON_syslogd_FLAGS?=-ss8cc

syslogd: _service



|




1
2
3
4
5
6

# vim:ft=make:

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

syslogd: _service
Modified watchdogd.service from [1734b4af46] to [642c770d75]. 
1
2
3
4
5
6
7
8
9
10
11

# 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: _daemon







|





1
2
3
4
5
6
7
8
9
10
11

# 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: _daemon