Attachment 250858 Details for Bug 279198 – proposed fix

[patch] proposed fix

off.diff (text/plain), 1.92 KB, created by Eugene Grosbein on 2024-05-21 14:15:54 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Eugene Grosbein

Created: 2024-05-21 14:15:54 UTC

Size: 1.92 KB

patch

obsolete

>--- rc.subr.orig	2023-07-14 21:41:09.243591000 +0700
>+++ rc.subr	2024-05-21 19:46:51.288077000 +0700
>@@ -808,6 +808,8 @@ startmsg()
> #
> #	${name}_limits	n	limits(1) to apply to ${command}.
> #
>+#	${name}_offcmd	n	If set, run if a service is not enabled.
>+#
> #	${rc_arg}_cmd	n	If set, use this as the method when invoked;
> #				Otherwise, use default command (see below)
> #
>@@ -1019,13 +1021,13 @@ run_rc_command()
> 		    -a "$rc_arg" != "describe" ] ||
> 		    [ -n "${rcvar}" -a "$rc_arg" = "stop" -a -z "${rc_pid}" ]; then
> 			if ! checkyesno ${rcvar}; then
>-				if [ -n "${rc_quiet}" ]; then
>-					return 0
>-				fi
>+			    [ "$rc_arg" = "start" ] && _run_rc_offcmd
>+			    if [ -z "${rc_quiet}" ]; then
> 				echo -n "Cannot '${rc_arg}' $name. Set ${rcvar} to "
> 				echo -n "YES in /etc/rc.conf or use 'one${rc_arg}' "
> 				echo "instead of '${rc_arg}'."
>-				return 0
>+			    fi
>+			    return 0
> 			fi
> 		fi
> 
>@@ -1308,10 +1310,25 @@ $command $rc_flags $command_args"
> #
> #	name	       R/W
> #	------------------
>+#	_offcmd		R
> #	_precmd		R
> #	_postcmd	R
> #	_return		W
> #
>+_run_rc_offcmd()
>+{
>+	eval _offcmd=\$${name}_offcmd
>+	if [ -n "$_offcmd" ]; then
>+		if [ -n "$_env" ]; then
>+			eval "export -- $_env"
>+		fi
>+		debug "run_rc_command: ${rc_arg}_offcmd: $_offcmd $rc_extra_args"
>+		eval "$_offcmd $rc_extra_args"
>+		_return=$?
>+	fi
>+	return 0
>+}
>+
> _run_rc_precmd()
> {
> 	check_required_before "$rc_arg" || return 1
>--- rc.d/devd.orig	2023-07-14 02:15:21.707279000 +0700
>+++ rc.d/devd	2024-05-21 21:14:09.856464000 +0700
>@@ -15,7 +15,8 @@ desc="Device state change daemon"
> rcvar="devd_enable"
> command="/sbin/${name}"
> 
>-start_precmd=${name}_prestart
>+devd_offcmd=devd_off
>+start_precmd=find_pidfile
> stop_precmd=find_pidfile
> 
> find_pidfile()
>@@ -27,10 +28,8 @@ find_pidfile()
> 	fi
> }
> 
>-devd_prestart()
>+devd_off()
> {
>-	find_pidfile
>-
> 	# If devd is disabled, turn it off in the kernel to avoid unnecessary
> 	# memory usage.
> 	if ! checkyesno ${rcvar}; then

Actions: View | Diff

Attachments on bug 279198: 250852 | 250856 | 250858