diff --git a/guesthandler-disarm.xml b/guesthandler-disarm.xml
index f3ef463..cdfdbe8 100644
--- a/guesthandler-disarm.xml
+++ b/guesthandler-disarm.xml
@@ -7,7 +7,10 @@
-
+
+
+
+
diff --git a/guesthandler.xml b/guesthandler.xml
index a2a22b2..eb32d75 100644
--- a/guesthandler.xml
+++ b/guesthandler.xml
@@ -7,11 +7,20 @@
-
-
+
+
+
+
+
+
+
+
+
+
+
diff --git a/guesthandler.sh b/svc-guesthandler
similarity index 87%
rename from guesthandler.sh
rename to svc-guesthandler
index e69df5c..5538265 100644
--- a/guesthandler.sh
+++ b/svc-guesthandler
@@ -4,15 +4,13 @@
. /lib/svc/share/smf_include.sh
-if [ -z "$SMF_FMRI" ]; then
- echo "this script can only be invoked by smf(5)"
- exit $SMF_EXIT_ERR_NOSMF
+if [ -z $SMF_FMRI ];
+ then
+ print "this script can only be invoked by smf(5)"
+ exit $SMF_EXIT_ERR_NOSMF
fi
-ME=$(basename ${0%.sh})
-
-# start-up delay between VMs
-DELAY=30
+ME=$(basename ${0#svc-})
function log {
# helper function to log arbitrary messages via syslog
@@ -34,7 +32,7 @@ case $1 in
then
# successful start, log and wait
log $UUID managed to $1
- sleep $DELAY
+ sleep ${DELAY:-0}
else
# failed to start guest
log $UUID failed to $1
@@ -75,7 +73,11 @@ case $1 in
;;
*)
- exit $SMF_EXIT_ERR;
+ if smf_present;
+ then
+ exit $SMF_EXIT_ERR_CONFIG;
+ else
+ print
esac
-exit $SMF_EXIT_OK
+exit $SMF_EXIT_NODAEMON
diff --git a/zones.xml b/zones.xml
deleted file mode 100644
index fcfea24..0000000
--- a/zones.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Zones autoboot and graceful shutdown
-
-
-
-
-
-
-
-