base-files: fix service_running check
The following command checks if a instance of a service is running.
/etc/init.d/<service> running <instance>
 In the variable `$@`, which is passed to the function
`service_running`, the first argument is always the `instance` which
should be checked. Because all other variables where removed from `$@`
with `shift`.
Before this change the first argument of `$@` was set to the `$service`
Variable. So the function does not work as expected. The `$service`
variable was always the instance which should be checked. This is not
what we want.
Signed-off-by: Florian Eckert <fe@dev.tdt.de>
Reviewed-by: Sungbo Eo <mans0n@gorani.run>
(cherry picked from commit dd681838d3)
			
			
This commit is contained in:
		 Florian Eckert
					Florian Eckert
				
			
				
					committed by
					
						 Christian Lamparter
						Christian Lamparter
					
				
			
			
				
	
			
			
			 Christian Lamparter
						Christian Lamparter
					
				
			
						parent
						
							e81dd8a10a
						
					
				
				
					commit
					dbe2a6343f
				
			| @@ -100,9 +100,9 @@ service_data() { | |||||||
| } | } | ||||||
|  |  | ||||||
| service_running() { | service_running() { | ||||||
| 	local service="${1:-$(basename $initscript)}" | 	local instance="${1:-*}" | ||||||
| 	local instance="${2:-*}" |  | ||||||
| 	procd_running "$service" "$instance" "$@" | 	procd_running "$(basename $initscript)" "$instance" | ||||||
| } | } | ||||||
|  |  | ||||||
| ${INIT_TRACE:+set -x} | ${INIT_TRACE:+set -x} | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user