--- old/usr/src/cmd/xvm/ipagent/ipagent.ksh	Thu May 14 14:22:12 2009
+++ new/usr/src/cmd/xvm/ipagent/ipagent.ksh	Thu May 14 14:22:10 2009
@@ -38,7 +38,7 @@
 #
 link_to_addr()
 {
-	tmp=`netstat -I $1 -in | awk '{print $4}' | grep -v Address`;
+	tmp=`netstat -I $1 -in -f inet | awk '{print $4}' | grep -v Address`;
 	if [ -z "$tmp" ] || [ "$tmp" = "0.0.0.0" ];
 	then
 		addr="(none)";
--- old/usr/src/cmd/xvm/ipagent/ipagent.xml	Thu May 14 14:22:14 2009
+++ new/usr/src/cmd/xvm/ipagent/ipagent.xml	Thu May 14 14:22:13 2009
@@ -36,6 +36,14 @@
 	<create_default_instance enabled='false'/>
         <single_instance />
 
+	<dependency
+		name='local'
+		type='service'
+		grouping='require_all'
+		restart_on='none'>
+		<service_fmri value='svc:/system/filesystem/local' />
+	</dependency>
+
         <exec_method
                 type='method'
                 name='start'
--- old/usr/src/cmd/xvm/ipagent/svc-ipagent	Thu May 14 14:22:17 2009
+++ new/usr/src/cmd/xvm/ipagent/svc-ipagent	Thu May 14 14:22:15 2009
@@ -24,19 +24,34 @@
 
 interval=$2
 
-. /lib/svc/share/xvm_include.sh
+. /lib/svc/share/smf_include.sh
 
+
+disable_self()
+{
+	echo "This service will only run in a PV xVM domU."
+	svcadm disable svc:/system/xvm/ipagent:default
+	sleep 5 &
+	exit $SMF_EXIT_OK
+}
+
+check_is_domu()
+{
+	if [ `uname -p` != "i386" -o `uname -i` != "i86xpv" ]; then
+		disable_self
+	fi
+
+	/usr/sbin/devfsadm -i domcaps
+	domcaps=`cat /dev/xen/domcaps 2>/dev/null`
+	echo "$domcaps" | grep "control_d" > /dev/null
+	if [ $? = 0 ]; then
+		disable_self
+	fi
+}
+
 case $1 in 
 'start')
-	#
-	# This service should only be enabled in a PV domU.
-	#
-	is_dom0
-	if [ $? -eq 0 ] || [ `uname -i` != "i86xpv" ]; then
-		echo "This service will only run in a PV xVM domU."
-		svcadm disable -t svc:/system/xvm/ipagent:default
-		exit $SMF_EXIT_OK
-	fi
+	check_is_domu
 
 	/usr/lib/xen/bin/ipagent $interval &