# HG changeset patch
# User Michael Schloh von Bennewitz <michael@schloh.com>
# Date 1343862493 -7200
# Node ID 37a0d0619cff9eb495a4fa1f3872b4714cf91a68
# Parent  b2db2cf97b30234ad2af8df90c8a3c8b4ce13fcf
Complete debugging of uninstallation startup/shutdown name and
reimplement smf(5) service name preference in manifest.

diff -r b2db2cf97b30 -r 37a0d0619cff openpkg/openpkg.spec
--- a/openpkg/openpkg.spec	Thu Aug 02 00:16:26 2012 +0200
+++ b/openpkg/openpkg.spec	Thu Aug 02 01:08:13 2012 +0200
@@ -2695,16 +2695,17 @@
                 fi
                 ;;
             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
                 fi
-                if [ ! -f /var/svc/manifest/openpkg/${prefix}.xml ]; then
+                if [ ! -f /var/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\">"
-                      echo "<service_bundle type='manifest' name='OpenPKG:${prefix}'>"
+                      echo "<service_bundle type='manifest' name='OpenPKG:${suname}'>"
                       echo "    <service"
-                      echo "        name='openpkg/${prefix}'"
+                      echo "        name='openpkg/${suname}'"
                       echo "        type='service'"
                       echo "        version='1'>"
                       echo "        <single_instance />"
@@ -2767,7 +2768,7 @@
                       echo "            <propval"
                       echo "                name='action_authorization'"
                       echo "                type='astring'"
-                      echo "                value='solaris.smf.manage.openpkg.${prefix}' />"
+                      echo "                value='solaris.smf.manage.openpkg.${suname}' />"
                       echo "        </property_group>"
                       echo "        <instance name='default' enabled='false' />"
                       echo "        <stability value='Unstable' />"
@@ -2778,10 +2779,10 @@
                       echo "        </template>"
                       echo "    </service>"
                       echo "</service_bundle>"
-                    ) >/var/svc/manifest/openpkg/${prefix}.xml
-                    chmod 644 /var/svc/manifest/openpkg/${prefix}.xml
-                    /usr/sbin/svccfg import /var/svc/manifest/openpkg/${prefix}.xml
-                    ( echo "/usr/sbin/svcadm enable \"svc:/openpkg/${prefix}:default\""
+                    ) >/var/svc/manifest/openpkg/${suname}.xml
+                    chmod 644 /var/svc/manifest/openpkg/${suname}.xml
+                    /usr/sbin/svccfg import /var/svc/manifest/openpkg/${suname}.xml
+                    ( echo "/usr/sbin/svcadm enable \"svc:/openpkg/${suname}:default\""
                     ) >%{l_prefix}.pre-post-process.sh
                 fi
                 ;;
@@ -3509,7 +3510,7 @@
     fi
 
     #   remove the startup/shutdown transfer scripts
-    name=`echo "$prefix" | sed -e 's;/;;g'`
+    name="openpkg-`echo "$prefix" | sed -e 's;[^a-zA-Z0-9];;g'`"
     if [ ".$cusr" != ".root" ]; then
         echo "openpkg:WARNING: skipping deletion of system run-command hooks" 1>&2
         echo "openpkg:WARNING: (would require root-privileges)" 1>&2
@@ -3586,9 +3587,10 @@
                 fi
                 ;;
             SunOS/5.1* )
-                /usr/sbin/svcadm disable "svc:/openpkg/${prefix}:default"; sleep 2
-                /usr/sbin/svccfg delete -f "svc:/openpkg/${prefix}:default" >/dev/null 2>&1 || true
-                rm -f /var/svc/manifest/openpkg/${prefix}.xml >/dev/null 2>&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
                 ;;
             SunOS/5.* )