Make use of name vs RC_SVCNAME consistent in supervisor scripts

This fixes #79.
This commit is contained in:
William Hubbs
2016-09-13 12:27:08 -05:00
parent ac53c9a658
commit 8a8032478a
4 changed files with 8 additions and 8 deletions

View File

@@ -46,7 +46,7 @@ ssd_start()
${command_user+--user} $command_user \
$_background $start_stop_daemon_args \
-- $command_args $command_args_background
if eend $? "Failed to start $RC_SVCNAME"; then
if eend $? "Failed to start ${name:-$RC_SVCNAME}"; then
service_set_value "command" "${command}"
[ -n "${chroot}" ] && service_set_value "chroot" "${chroot}"
[ -n "${pidfile}" ] && service_set_value "pidfile" "${pidfile}"
@@ -80,7 +80,7 @@ ssd_stop()
${pidfile:+--pidfile} $chroot$pidfile \
${stopsig:+--signal} $stopsig
eend $? "Failed to stop $RC_SVCNAME"
eend $? "Failed to stop ${name:-$RC_SVCNAME}"
}
ssd_status()