From 85ed1160fd71845d58d0501c5a17f239ab2595b4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tam=C3=A1s=20G=C3=A9rczei?= <tamas@gerczei.eu>
Date: Tue, 19 Apr 2016 09:34:42 +0200
Subject: [PATCH] added convenience property 'config/method_prefix' defaulting
 to '/opt/custom/bin' to both services

---
 guesthandler-disarm.xml | 5 ++++-
 guesthandler.xml        | 5 +++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/guesthandler-disarm.xml b/guesthandler-disarm.xml
index cdfdbe8..ef7da5d 100644
--- a/guesthandler-disarm.xml
+++ b/guesthandler-disarm.xml
@@ -10,11 +10,14 @@
     <dependent name='zones' grouping='require_all' restart_on='none'>
       <service_fmri value='svc:/system/zones'/>
     </dependent>
-    <exec_method name='start' type='method' exec='/opt/custom/bin/svc-guesthandler disarm' timeout_seconds='0'/>
+    <exec_method name='start' type='method' exec='%{config/method_prefix}/svc-guesthandler disarm' timeout_seconds='0'/>
     <exec_method name='stop' type='method' exec=':true' timeout_seconds='100'/>
     <property_group name='startd' type='framework'>
       <propval name='duration' type='astring' value='transient'/>
     </property_group>
+    <property_group name='config' type='eu.gerczei,guesthandler_configuration'>
+      <propval name='method_prefix' type='astring' value='/opt/custom/bin'/>
+    </property_group>
     <stability value='Unstable'/>
     <template>
       <common_name>
diff --git a/guesthandler.xml b/guesthandler.xml
index eb32d75..b03e013 100644
--- a/guesthandler.xml
+++ b/guesthandler.xml
@@ -7,19 +7,20 @@
     <dependency name='vmadmd' grouping='require_all' restart_on='none' type='service'>
       <service_fmri value='svc:/system/smartdc/vmadmd:default'/>
     </dependency>
-    <exec_method name='start' type='method' exec='/opt/custom/bin/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_environment>
           <envvar name='DELAY' value='%{config/delay}'/>
         </method_environment>
       </method_context>
     </exec_method>
-    <exec_method name='stop' type='method' exec='/opt/custom/bin/svc-guesthandler %m' timeout_seconds='0'/>
+    <exec_method name='stop' type='method' exec='%{config/method_prefix}/svc-guesthandler %m' timeout_seconds='0'/>
     <property_group name='startd' type='framework'>
       <propval name='duration' type='astring' value='transient'/>
     </property_group>
     <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'/>
     </property_group>
     <stability value='Unstable'/>
     <template>