Check-in [be4f89a54b]
Logged in as anonymous
Overview
Comment:fix automountd, fix daemon, change daemonizers description
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA3-256: be4f89a54bfb771058018b06cb1e3e80c34c1731ac7856a7469e1e1e3f8b791e
User & Date: arcade on 2019-10-21 15:38:04.390
Other Links: manifest | tags
Context
2019-10-21
16:17
rename, make silent, add correct logging, collapse command check-in: 7a1e7f4a58 user: arcade tags: trunk
15:38
fix automountd, fix daemon, change daemonizers description check-in: be4f89a54b user: arcade tags: trunk
15:12
adding starters, renaming stuff check-in: ebafd89015 user: arcade tags: trunk
Changes
Unified Diff Ignore Whitespace Patch
Modified automountd.service from [bb57bfccba] to [8797d31f75]. 
1
2
3
4
5
6
7
8

# vim:ft=make:

DAEMON_automountd_COMMAND?=/usr/sbin/autmountd
DAEMON_automountd_ENABLE?=no
DAEMON_automountd_MODULES=autofs

automountd: _service # nfsclient -> DAEMON
	test -z "$${DAEMON_$@_ENABLE}" || /usr/sbin/automount



|






1
2
3
4
5
6
7
8

# 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
Modified daemon.starter.mk from [ef71a74be7] to [d0657fc3d2]. 
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15

LOCAL_TARGETS:=_service_daemon _earlyservice_daemon
OTHER_TARGETS+=${LOCAL_TARGETS}
.if ${STARTER} == "plain"
LOCAL_TARGETS+=_service _earlyservice
.endif

.for target in ${LOCAL_TARGETS}
${target}: ${target:C/_service.*/DAEMON/:C/_earlyservice.*/SERVICE/} .USE
	test -z "$${DAEMON_$@_ENABLE}" || { \
	  test -n "${DAEMON_$@_MODULES}" && kldload -n ${DAEMON_$@_MODULES} || true; \
	  daemon -c -u ${DAEMON_$@_USER:Uroot} -P /var/run/daemon.$@.pid ${DAEMON_$@_COMMAND} ${DAEMON_$@_FLAGS}; \
	}
.endfor

.undef LOCAL_TARGETS



|







|





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

LOCAL_TARGETS:=_service_daemon _earlyservice_daemon
OTHER_TARGETS+=${LOCAL_TARGETS}
.if ${STARTER} == "daemon"
LOCAL_TARGETS+=_service _earlyservice
.endif

.for target in ${LOCAL_TARGETS}
${target}: ${target:C/_service.*/DAEMON/:C/_earlyservice.*/SERVICE/} .USE
	test -z "$${DAEMON_$@_ENABLE}" || { \
	  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

.undef LOCAL_TARGETS
Modified mrc.conf from [b71938ce78] to [636ba38911]. 
1
2
3
4
5
6
7
8
9
10
11

# vim:ft=make:

# daemonizers
# DAEMONIZER=svc.daemon

# cleanvar
# CLEANVAR_DIRS=/var/run /var/spool/lock /var/spool/uucp/.Temp

# random
# ENTROPY_FILE=/var/db/entropy/random
# ENTROPY_DIR=/var/db/entropy



|
|








1
2
3
4
5
6
7
8
9
10
11

# vim:ft=make:

# STARTERS
# STARTER=(svc|plain|daemon)

# cleanvar
# CLEANVAR_DIRS=/var/run /var/spool/lock /var/spool/uucp/.Temp

# random
# ENTROPY_FILE=/var/db/entropy/random
# ENTROPY_DIR=/var/db/entropy
︙︙