tgerczei
/
smartos-guesthandler
mirror of https://github.com/tgerczei/smartos-guesthandler.git
1
0
Fork 0
Code Issues Releases Wiki Activity

fixed broken method script plus removed property 'config/delay' since SMF does not do token expansion anywhere outside 'exec'

This commit is contained in:
Tamás Gérczei 2016-04-19 10:44:11 +02:00
parent 85ed1160fd
commit 0b291a37cf
2 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
guesthandler.xml
View File

@ -10,7 +10,7 @@
<exec_method name='start' type='method' exec='%{config/method_prefix}/svc-guesthandler %m' timeout_seconds='0'> <exec_method name='start' type='method' exec='%{config/method_prefix}/svc-guesthandler %m' timeout_seconds='0'>
<method_context> <method_context>
<method_environment> <method_environment>
<envvar name='DELAY' value='%{config/delay}'/> <envvar name='DELAY' value='30'/>
</method_environment> </method_environment>
</method_context> </method_context>
</exec_method> </exec_method>
@ -19,7 +19,6 @@
<propval name='duration' type='astring' value='transient'/> <propval name='duration' type='astring' value='transient'/>
</property_group> </property_group>
<property_group name='config' type='eu.gerczei,guesthandler_configuration'> <property_group name='config' type='eu.gerczei,guesthandler_configuration'>
<propval name='delay' type='integer' value='30'/>
<propval name='method_prefix' type='astring' value='/opt/custom/bin'/> <propval name='method_prefix' type='astring' value='/opt/custom/bin'/>
</property_group> </property_group>
<stability value='Unstable'/> <stability value='Unstable'/>

7
svc-guesthandler
View File

@ -73,11 +73,8 @@ case $1 in
;; ;;
*) *)
if smf_present; exit $SMF_EXIT_ERR_CONFIG
then ;;
exit $SMF_EXIT_ERR_CONFIG;
else
print
esac esac
exit $SMF_EXIT_NODAEMON exit $SMF_EXIT_NODAEMON