Attachment 257950 Details for Bug 207811 – corrected patch

[patch] corrected patch

service2.patch (text/plain), 1.30 KB, created by Mark Linimon on 2025-02-25 20:48:09 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Mark Linimon

Created: 2025-02-25 20:48:09 UTC

Size: 1.30 KB

patch

obsolete

>--- usr.sbin/service/service.sh	2017-07-01 17:30:32.193636000 +0200
>+++ usr.sbin/service/service.sh	2017-09-19 15:34:44.863558000 +0200
>@@ -67,21 +67,17 @@
> 	[ -n "$local_startup" ] && find_local_scripts_new
> 	files=`rcorder ${skip} ${local_rc} 2>/dev/null`
> 
>+	dummy=NO
> 	for file in `reverse_list ${files}`; do
>-		if grep -q ^rcvar $file; then
>-			eval `grep ^name= $file`
>-			eval `grep ^rcvar $file`
>-			if [ -n "$rcvar" ]; then
>-				load_rc_config_var ${name} ${rcvar}
>-			fi
>-			checkyesno $rcvar 2>/dev/null && run_rc_script ${file} stop
>+		rcvar=dummy
>+		if run_rc_script ${file} enabled; then
>+			run_rc_script ${file} stop
> 		fi
> 	done
> 	for file in $files; do
>-		if grep -q ^rcvar $file; then
>-			eval `grep ^name= $file`
>-			eval `grep ^rcvar $file`
>-			checkyesno $rcvar 2>/dev/null && run_rc_script ${file} start
>+		rcvar=dummy
>+		if run_rc_script ${file} enabled; then
>+			run_rc_script ${file} start
> 		fi
> 	done
> 
>@@ -99,14 +95,11 @@
> fi
> 
> if [ -n "$ENABLED" ]; then
>+	dummy=NO
> 	for file in $files; do
>-		if grep -q ^rcvar $file; then
>-			eval `grep ^name= $file`
>-			eval `grep ^rcvar $file`
>-			if [ -n "$rcvar" ]; then
>-				load_rc_config_var ${name} ${rcvar}
>-			fi
>-			checkyesno $rcvar 2>/dev/null && echo $file
>+		rcvar=dummy
>+		if run_rc_script ${file} enabled; then
>+			echo ${file}
> 		fi
> 	done
> 	exit 0

Actions: View | Diff

Attachments on bug 207811: 186509 | 186540 | 257948 | 257949 | 257950