diff options
Diffstat (limited to 'libexec/rc')
| -rwxr-xr-x | libexec/rc/debug.sh | 11 | ||||
| -rwxr-xr-x | libexec/rc/hooks.sh | 17 | ||||
| -rw-r--r-- | libexec/rc/rc.conf | 1 | ||||
| -rw-r--r-- | libexec/rc/rc.d/Makefile | 50 | ||||
| -rw-r--r-- | libexec/rc/safe_eval.sh | 12 |
5 files changed, 47 insertions, 44 deletions
diff --git a/libexec/rc/debug.sh b/libexec/rc/debug.sh index b379297a4183..739c81a709f6 100755 --- a/libexec/rc/debug.sh +++ b/libexec/rc/debug.sh @@ -1,6 +1,4 @@ : -# SPDX-License-Identifier: BSD-2-Clause - # NAME: # debug.sh - selectively debug scripts # @@ -83,16 +81,11 @@ # Simon J. Gerraty <sjg@crufty.net> # RCSid: -# $Id: debug.sh,v 1.46 2024/12/13 03:55:52 sjg Exp $ +# $Id: debug.sh,v 1.47 2025/08/07 21:59:54 sjg Exp $ # # @(#) Copyright (c) 1994-2024 Simon J. Gerraty # -# This file is provided in the hope that it will -# be of use. There is absolutely NO WARRANTY. -# Permission to copy, redistribute or otherwise -# use this file is hereby granted provided that -# the above copyright notice and this notice are -# left intact. +# SPDX-License-Identifier: BSD-2-Clause # # Please send copies of changes and bug-fixes to: # sjg@crufty.net diff --git a/libexec/rc/hooks.sh b/libexec/rc/hooks.sh index 7c478fbeda15..af4aff3d6bc5 100755 --- a/libexec/rc/hooks.sh +++ b/libexec/rc/hooks.sh @@ -1,6 +1,4 @@ : -# SPDX-License-Identifier: BSD-2-Clause - # NAME: # hooks.sh - provide hooks for customization # @@ -20,7 +18,7 @@ # # DESCRIPTION: # The functions add_hooks and run_hooks are retained for -# backwards compatability. They are aliases for hooks_add and +# backwards compatibility. They are aliases for hooks_add and # hooks_run. # # hooks_add_all simply adds the "func"s to the list "HOOKS". @@ -50,16 +48,15 @@ # # RCSid: -# $Id: hooks.sh,v 1.24 2024/12/13 03:55:52 sjg Exp $ +# $Id: hooks.sh,v 1.26 2025/08/07 21:59:54 sjg Exp $ # # @(#)Copyright (c) 2000-2024 Simon J. Gerraty # -# This file is provided in the hope that it will -# be of use. There is absolutely NO WARRANTY. -# Permission to copy, redistribute or otherwise -# use this file is hereby granted provided that -# the above copyright notice and this notice are -# left intact. +# SPDX-License-Identifier: BSD-2-Clause +# +# Please send copies of changes and bug-fixes to: +# sjg@crufty.net +# # avoid multiple inclusion _HOOKS_SH=: diff --git a/libexec/rc/rc.conf b/libexec/rc/rc.conf index d502361eca37..bfa46bd343a6 100644 --- a/libexec/rc/rc.conf +++ b/libexec/rc/rc.conf @@ -21,6 +21,7 @@ ############################################################## # Set default value of _localbase if not previously set +: ${_localbase:="$(/sbin/sysctl -n user.localbase 2> /dev/null)"} : ${_localbase:="/usr/local"} # rc_debug can't be set here without interferring with rc.subr's setting it diff --git a/libexec/rc/rc.d/Makefile b/libexec/rc/rc.d/Makefile index 27d8a7526691..d0c6fc1dee46 100644 --- a/libexec/rc/rc.d/Makefile +++ b/libexec/rc/rc.d/Makefile @@ -29,12 +29,8 @@ CONFS= DAEMON \ iovctl \ ip6addrctl \ ipsec \ - ${_kadmind} \ - ${_kdc} \ - ${_kfd} \ kld \ kldxref \ - ${_kpasswdd} \ ldconfig \ linux \ local \ @@ -62,7 +58,6 @@ CONFS= DAEMON \ rarpd \ rctl \ root \ - route6d \ routing \ rpcbind \ rtadvd \ @@ -220,7 +215,7 @@ FTPD= ftpd FTPDPACKAGE= ftpd .endif -.if ${MK_GSSAPI} != "no" +.if ${MK_GSSAPI} != "no" && ${MK_KERBEROS_SUPPORT} != "no" CONFGROUPS+= GSSD GSSD= gssd GSSDPACKAGE= gssd @@ -289,17 +284,32 @@ LPPACKAGE= lp .endif .if ${MK_KERBEROS} != "no" -CONFS+= ipropd_master -CONFS+= ipropd_slave -_kadmind= kadmind -_kdc= kdc -_kfd= kfd -_kpasswdd= kpasswdd - -DIRS+= VAR_HEMIDAL +.if ${MK_MITKRB5} == "no" + +# Heimdal rc scripts +CONFGROUPS+= HEIMDAL +HEIMDAL= ipropd_master \ + ipropd_slave \ + kadmind \ + kdc \ + kfd \ + kpasswdd +HEIMDALPACKAGE= kerberos + +DIRS+= VAR_HEMIDAL VAR_HEMIDAL= /var/heimdal VAR_HEMIDAL_MODE= 700 -.endif + +.else # ${MK_MITKRB5} != "no" + +# MIT KRB5 rc scripts +CONFGROUPS+= KRB5 +KRB5= kadmind \ + kdc +KRB5PACKAGE= kerberos-kdc + +.endif # ${MK_MITKRB5} +.endif # ${MK_KERBEROS} .if ${MK_NIS} != "no" CONFGROUPS+= YP @@ -355,8 +365,16 @@ PPP= ppp PPPPACKAGE= ppp .endif +.if ${MK_INET6} != "no" || ${MK_ROUTED} != "no" +CONFGROUPS+= RIP +RIPPACKAGE= rip + +.if ${MK_INET6} != "no" +RIP+= route6d +.endif .if ${MK_ROUTED} != "no" -CONFS+= routed +RIP+= routed +.endif .endif .if ${MK_SENDMAIL} != "no" diff --git a/libexec/rc/safe_eval.sh b/libexec/rc/safe_eval.sh index 8aaddcaf2176..6c23b4c98218 100644 --- a/libexec/rc/safe_eval.sh +++ b/libexec/rc/safe_eval.sh @@ -1,16 +1,10 @@ -# SPDX-License-Identifier: BSD-2-Clause - +: # RCSid: -# $Id: safe_eval.sh,v 1.24 2025/05/23 21:34:54 sjg Exp $ +# $Id: safe_eval.sh,v 1.25 2025/08/07 22:13:03 sjg Exp $ # # @(#) Copyright (c) 2023-2024 Simon J. Gerraty # -# This file is provided in the hope that it will -# be of use. There is absolutely NO WARRANTY. -# Permission to copy, redistribute or otherwise -# use this file is hereby granted provided that -# the above copyright notice and this notice are -# left intact. +# SPDX-License-Identifier: BSD-2-Clause # # Please send copies of changes and bug-fixes to: # sjg@crufty.net |