emo/openrc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

More s6 fixes

Browse Source 
- When no service link is in the scan directory, show the default
  stopped message.
- Do not remove the service link when stopping the service.
This commit is contained in:
William Hubbs 2015-05-13 16:51:55 -05:00
parent e372f97beb
commit ddce529c71
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
sh/s6.sh
View File

@ -37,12 +37,16 @@ s6_stop()
fi fi
sleep 1.5 sleep 1.5
set -- $(s6-svstat "${s6_service_link}") set -- $(s6-svstat "${s6_service_link}")
[ "$1" = "down" ] && rm -fr "${s6_service_link}" [ "$1" = "down" ]
eend $? "Failed to stop $RC_SVCNAME" eend $? "Failed to stop $RC_SVCNAME"
} }
s6_status() s6_status()
{ {
s6_service_link="${RC_SVCDIR}/s6-scan/${s6_service_path##*/}" s6_service_link="${RC_SVCDIR}/s6-scan/${s6_service_path##*/}"
s6-svstat "${s6_service_link}" if [ -L "${s6_service_link}" ]; then
s6-svstat "${s6_service_link}"
else
_status
fi
} }