diff -r f612614bead7 -r dec7ed8e8eaf openpkg/openpkg.spec
--- a/openpkg/openpkg.spec	Thu Aug 02 01:49:00 2012 +0200
+++ b/openpkg/openpkg.spec	Thu Aug 02 22:07:29 2012 +0200
@@ -2696,10 +2696,11 @@
                 ;;
             SunOS/5.1* )
                 suname="`echo "$prefix" | sed -e 's;[^a-zA-Z0-9];;g'`"
-                if [ ! -d /var/svc/manifest/openpkg ]; then
-                    mkdir /var/svc/manifest/openpkg
+                svcdir=/`[ -d /lib/svc/manifest ] && echo lib || echo var`
+                if [ ! -d /${svcdir}/svc/manifest/openpkg ]; then
+                    mkdir /${svcdir}/svc/manifest/openpkg
                 fi
-                if [ ! -f /var/svc/manifest/openpkg/${suname}.xml ]; then
+                if [ ! -f /${svcdir}/svc/manifest/openpkg/${suname}.xml ]; then
                     #   install SMF manifest
                     ( echo "<?xml version=\"1.0\"?>"
                       echo "<!DOCTYPE service_bundle SYSTEM \"/usr/share/lib/xml/dtd/service_bundle.dtd.1\">"
@@ -2708,6 +2709,7 @@
                       echo "        name='openpkg/${suname}'"
                       echo "        type='service'"
                       echo "        version='1'>"
+                      echo "        <create_default_instance enabled='false' />"
                       echo "        <single_instance />"
                       echo "        <dependency"
                       echo "            name='filesystem'"
@@ -2748,6 +2750,15 @@
                       echo "        </exec_method>"
                       echo "        <exec_method"
                       echo "            type='method'"
+                      echo "            name='refresh'"
+                      echo "            exec='${prefix}/etc/rc all restart'"
+                      echo "            timeout_seconds='270'>"
+                      echo "            <method_context>"
+                      echo "                <method_credential user='root' group='root' />"
+                      echo "            </method_context>"
+                      echo "        </exec_method>"
+                      echo "        <exec_method"
+                      echo "            type='method'"
                       echo "            name='stop'"
                       echo "            exec='${prefix}/etc/rc all stop'"
                       echo "            timeout_seconds='180'>"
@@ -2770,7 +2781,6 @@
                       echo "                type='astring'"
                       echo "                value='solaris.smf.manage.openpkg.${suname}' />"
                       echo "        </property_group>"
-                      echo "        <instance name='default' enabled='false' />"
                       echo "        <stability value='Unstable' />"
                       echo "        <template>"
                       echo "            <common_name>"
@@ -2779,10 +2789,9 @@
                       echo "        </template>"
                       echo "    </service>"
                       echo "</service_bundle>"
-                    ) >/var/svc/manifest/openpkg/${suname}.xml
-                    chmod 644 /var/svc/manifest/openpkg/${suname}.xml
+                    ) >/${svcdir}/svc/manifest/openpkg/${suname}.xml
                     /usr/sbin/svcadm restart svc:/system/manifest-import
-                    ( echo "/usr/sbin/svcadm enable \"svc:/openpkg/${suname}:default\""
+                    ( echo "/usr/sbin/svcadm enable svc:/openpkg/${suname}:default"
                     ) >%{l_prefix}.pre-post-process.sh
                 fi
                 ;;
@@ -3588,10 +3597,11 @@
                 ;;
             SunOS/5.1* )
                 suname="`echo "$prefix" | sed -e 's;[^a-zA-Z0-9];;g'`"
-                /usr/sbin/svcadm disable "svc:/openpkg/${suname}:default"; sleep 2
-                /usr/sbin/svccfg delete -f "svc:/openpkg/${suname}:default" >/dev/null 2>&1 || true
-                rm -f /var/svc/manifest/openpkg/${suname}.xml >/dev/null 2>&1
-                rmdir /var/svc/manifest/openpkg >/dev/null 2>&1 || true
+                svcdir=/`[ -d /lib/svc/manifest ] && echo lib || echo var`
+                /usr/sbin/svcadm disable svc:/openpkg/${suname}:default; sleep 2
+                rm -f /${svcdir}/svc/manifest/openpkg/${suname}.xml >/dev/null 2>&1
+                rmdir /${svcdir}/svc/manifest/openpkg >/dev/null 2>&1 || true
+                /usr/sbin/svcadm restart svc:/system/manifest-import
                 ;;
             SunOS/5.* )
                 rm -f /etc/init.d/${name} >/dev/null 2>&1